Working on map resize
Merge branch 'origin-deployment'

Conflicts:
	app/assets/javascripts/backbone/views/map.js.coffee