Smallll fixes
Testing merge
Merge branch 'master' of https://github.com/rohanisaac/basic-cms

Conflicts:
	admin/pagecreation.php
Trying to add fix