Dev
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/pages/controllers/PageController.php