Merge branch 'master' of github.com:tomarcafe/tzm-blade into angelo

Conflicts:
	app/controllers/map.coffee
	assets/js/map.js