Merge branch 'master' of gitorious.org:lorea/n1_theme

Conflicts:
	_graphics/elgg_sprites.png

diff --cc views/default/css/elements/icons.php
index ed1a587907629ef6f9a8d78d2fb744cf2e11dd2b,2d6db62a9612308600ca85065bb1a6efb21c5be4..07d14612d11fc37257baedb54a0c5ccde319499a
--- 1/views/default/css/elements/icons.php
--- 2/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@@ -281,16 -281,13 +281,22 @@@
  .elgg-icon-logout:hover, .elgg-menu-item-logout:hover a {
        background-position: 0 -1542px;
  }
+ .elgg-icon-groups {
+       background-position: 0 -1577px;
+ }
+ .elgg-icon-groups:hover {
+       background-position: 0 -1560px;
+ }
  
 +.elgg-icon-group, .elgg-menu-item-group a {
 +      background-position: 0 -1560px;
 +}
 +
 +.elgg-icon-group:hover, .elgg-menu-item-group:hover a {
 +      background-position: 0 -1578px;
 +}
 +
 +
  
  .elgg-avatar > .elgg-icon-hover-menu {
        display: none;