Fix lat and long
Merge branch 'master' of github.com:leonpegg/springhack

Conflicts:
	public/javascripts/app.js