Merge branch '0.8.x' into groupblock

Conflicts:
	lib/router.php

diff --cc lib/router.php
index 469d9a17155d567a85ca16904219275945959eac,5db401e7418e12d46cedb39dffceb4c82f9fc39d..3d870e5651ea54c90291b20a62cea61a0f50748e
--- 1/lib/router.php
--- 2/lib/router.php
+++ b/lib/router.php
@@@ -101,7 -101,7 +101,7 @@@ class Route
          $main = array('login', 'logout', 'register', 'subscribe',
                        'unsubscribe', 'confirmaddress', 'recoverpassword',
                        'invite', 'favor', 'disfavor', 'sup',
-                       'block', 'subedit', 'groupblock');
 -                      'block', 'unblock', 'subedit');
++                      'block', 'unblock', 'subedit', 'groupblock');
  
          foreach ($main as $a) {
              $m->connect('main/'.$a, array('action' => $a));