Merge branch '0.7.x' into 0.8.x

Resolved Conflicts:
	lib/queuehandler.php
	lib/util.php
	theme/base/css/display.css

diff --cc classes/Notice.php
Simple merge

diff --cc lib/common.php
Simple merge

diff --cc lib/router.php
Simple merge

diff --cc lib/util.php
Simple merge

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