restructuring fixed
Merge branch 'master' of github.com:edlongman/whileaway

Conflicts:
	site/include.php