Update for google maps
Merge branch 'master' of github.com:leonpegg/springhack

Conflicts:
	public/javascripts/app.js
	public/stylesheets/layout.css
	views/layout.jade