New MVC Locations with JS to work with Google Maps API
New MVC Locations with JS to work with Google Maps API
Merge branch 'master' of https://github.com/rlfriedm/HAP-APP

Conflicts:
	app/assets/javascripts/application.js
	app/views/layouts/application.html.erb
	config/routes.rb
	db/development.sqlite3
	tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
just trying to merge conflicts
Fixing previous merge conflicts
fixing merge conflicts
fixing merge conflicts