Updated to handle reuse of header and footer on pages.
Merge remote-tracking branch 'origin/dev.tim.chandler' into dev.dms

Conflicts:
	www/index.html