premerge
Merge branch 'master' of github.com:massiveboom/mapapp

Conflicts:
	public/javascripts/map.js