Merge remote-tracking branch 'origin/master'

Conflicts:
	application/classes/Controller/Page.php
	application/classes/Controller/Pageedit.php
	application/classes/Model/Page.php
	application/views/pages/view.php