Close #991 - Move footer container
testing diff
Merge branch 'master' of https://github.com/roots/roots

Conflicts:
	templates/footer.php
Various updates