Update from SVN
Merge branch 'master' into vulninjections

Conflicts:
	classes/App/Page.php
	classes/App/Pixie.php
Update from SVN
Merge branch 'master' into vulninjections