small change
Merge remote-tracking branch 'origin/wes' into tal

Conflicts:
	headerAndFooter.php
	index.php