Merge branch 'develop' into release

Conflicts:
	index.php
	script/staging