google map
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/app/app.coffee
	public/js/main.js
	views/admin.html
refactoring