fix up the homepage
Merge branch 'master' of https://github.com/saltcod/waterstreetv6

Conflicts:
	footer.php
	library/css/ie.css
	library/css/style.css
	library/less/_768up.less