homepage templating in progress
Merge branch 'master' into dev-jason

Conflicts:
	html/index.php
Housekeeping - moving the folder structure to work with the auto-pagegen format