readded some lost code, added some fancyness..
Merge branch 'master' of github.com:Oted/BMAP

Conflicts:
	public/stylesheets/screen.css
	sass/partials/_overlay.scss