Merge branch '1.9' into 1.9-to-1.x

Conflicts:
	docs/guides/hooks-list.rst
	engine/classes/ElggInstaller.php
	engine/classes/ElggMenuItem.php
	engine/classes/ElggUpgrade.php
	engine/lib/navigation.php
	engine/tests/phpunit/ElggUpgradeTest.php