bugfix again :O
Merge branch 'feature/web-dev' of https://github.com/dolstrm001/Demeter-Project into feature/web-dev

Conflicts:
	application/controllers/cmscontroller.php
	application/views/cmstemplates/createpage.php