Header, Footer, Homepage Fixes
Merge branch 'master' into front-end

Conflicts:
	static/global/css/screen.css
	static/global/sass/core/_typography.scss
	templates/base.html
Cleaned up images
Merge branch 'master' into front-end
Merge branch 'master' into front-end

Conflicts:
	static/global/css/screen.css
Merge branch 'front-end' of https://github.com/FransTwisk/bluebottle into fixes-fixes-fixes

Conflicts:
	static/global/css/screen.css