locations maps doesn't show markers (ReferenceError: Gmaps is not defined)
Merge branch 'master' of https://github.com/undersky0/uu2

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/facebook.js.coffee.erb
	app/controllers/friendmap_controller.rb
	app/controllers/locations_controller.rb
	app/controllers/messages_controller.rb
	app/views/friendmap/index.html.erb
	app/views/layouts/application.html.erb
	app/views/locations/index.html.erb
	app/views/messages/_form.html.haml
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/D32/A00/sprockets%2F14c2016f7d39701ebe0fbe2418df334d
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/DAC/610/sprockets%2F7ef45e34f5dc9098ae59077a0cdf4a3e
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af