footer Styles/main nav update
Merge branch 'refs/heads/master' into cclark

Conflicts:
	views/scss/components/_topnav.scss