Corrected render and query logic for pages.
Merge branch 'master' into stage

Conflicts:
	apps/fusion/controllers/PagesController.php