Merge remote-tracking branch 'origin/bearded-computing-machine'

Conflicts:
	database/cms_2.sql
	projectAdmin/pages/organize_sections.php
	projectAdmin/pages/page_add.php
	projectAdmin/pages/resource_updateList.php
	scripts/cms.php
	scripts/cms/authors.php
	scripts/cms/cms.php
	scripts/cms/pages.php