I forgot to commit some changes :/
Merge branch 'master' of https://github.com/somerandomsequence/falling-fruit

Conflicts:
	app/views/locations/_form.html.erb
	app/views/locations/_infowindow.html.erb