fixes #599

Also fixes a js error on page selector

Conflicts:

	admin/inc/template_functions.php
	admin/template/js/ckeditor/config.js
Merge branch 'develop' of github.com:GetSimpleCMS/GetSimpleCMS into develop