Merge commit 'origin/testing' into 0.9.x

Conflicts:
	lib/action.php
	lib/adminpanelaction.php

3 files changed, 21 insertions, 6 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index f32c57ea4..01d5dd134 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -452,6 +452,13 @@ width:100%;
 float:left;
 }
 
+#content.admin {
+width:95.5%;
+}
+#content.admin #content_inner {
+width:66.3%;
+}
+
 #aside_primary {
 width:27.917%;
 min-height:259px;
@@ -764,10 +771,12 @@ display:none;
 text-align:center;
 }
 
-.entity_moderation {
+.entity_moderation,
+.entity_role {
 position:relative;
 }
-.entity_moderation p {
+.entity_moderation p,
+.entity_role p {
 border-radius:4px;
 -moz-border-radius:4px;
 -webkit-border-radius:4px;
@@ -775,13 +784,14 @@ font-weight:bold;
 padding-bottom:2px;
 margin-bottom:7px;
 }
-.entity_moderation ul {
+.entity_moderation ul,
+.entity_role ul {
 display:none;
 }
-.entity_moderation:hover ul {
+.entity_moderation:hover ul,
+.entity_role:hover ul {
 display:block;
-min-width:21%;
-width:100%;
+width:110%;
 padding:11px;
 position:absolute;
 top:-1px;
diff --git a/theme/base/images/icons/README b/theme/base/images/icons/README
index ea582149f..f701959ca 100644
--- a/theme/base/images/icons/README
+++ b/theme/base/images/icons/README
@@ -45,6 +45,11 @@
         White pin with green background
         White underscore with green background
         White C with green background
+        White magic wand with green background
+        Green badge with white background
+        Green sandbox with white background
+        Green speech bubble broken with white background
+        Green person with tie with white background
  */
 
 Created by various authors
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index be884ff48..bf0f1230e 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif