Merge branch '0.7.x' into 0.8.x

Conflicts:

	EVENTS.txt

diff --cc EVENTS.txt
index d689f0be63235ce987d4731dbf6374d0e239af6d,e0ce1166679a90f4e5c6289d9bc7f8dafaa94a13..8e917f11de864605b5e561caf1b797f33a3d0e96
--- 1/EVENTS.txt
--- 2/EVENTS.txt
+++ b/EVENTS.txt
@@@ -103,9 -109,5 +109,11 @@@ EndSubGroupNav: At the end of the subsc
  RouterInitialized: After the router instance has been initialized
  - $m: the Net_URL_Mapper that has just been set up
  
 +StartLogout: Before logging out
 +- $action: the logout action
 +
 +EndLogout: After logging out
 +- $action: the logout action
 +
+ ArgsInitialized: After the argument array has been initialized
+ - $args: associative array of arguments, can be modified

diff --cc index.php
Simple merge

diff --cc lib/action.php
Simple merge

diff --cc theme/base/css/display.css
Simple merge