Commits for Orange

Merge branch '7.x-1.x' of git.drupal.org:project/orange into 7.x-1.x

Conflicts:
js/orange.js
logo.png
orange.info
orange/css/style.css
preprocess/preprocess-block.inc
preprocess/preprocess-comment-wrapper.inc
preprocess/preprocess-comment.inc
preprocess/preprocess-node.inc
preprocess/preprocess-page.inc
template.php
templates/block.tpl.php
templates/comment-wrapper.tpl.php
templates/comment.tpl.php
templates/node.tpl.php
templates/page.tpl.php

Stripping CVS keywords

Stripping CVS keywords

Added secondary tabs styling to admin theme.