users can choose location
Merge remote-tracking branch 'origin'

Conflicts:
	app/assets/javascripts/images.js
	app/assets/javascripts/map.js
	app/views/images/new.html.erb
	config/routes.rb
Merge branch 'master' into seed

Conflicts:
	app/assets/javascripts/map.js