hmm
sync with live
Merge branch 'bearded-computing-machine' of https://github.com/JulaineScott/update-your-own-site into bearded-computing-machine

Conflicts:
	projectAdmin/categories/category.php
	projectAdmin/categories/category_add.php
	projectAdmin/categories/index.php
	projectAdmin/pages/author_add.php
	projectAdmin/pages/authors.php
	projectAdmin/pages/idea_page.php
	projectAdmin/pages/index.php
	scripts/cms/cms.php