modif gemfile
Merge branch 'master' of https://github.com/helaaura/MyTripMap

Conflicts:
	Gemfile
test
Some corrections
Merge branch 'master' of https://github.com/helaaura/MyTripMap

Conflicts:
	app/assets/javascripts/application.js
add album
- pout a rounded map (commit only the js, css and html)
Test submit location
controle locations, abums and picture
Merge branch 'master' of https://github.com/helaaura/MyTripMap

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/map/dynamic-map-height.js
	app/assets/javascripts/map/example.js
	app/assets/javascripts/map/free-draw-polygons.js
	app/assets/javascripts/map/geojson.js
	app/assets/javascripts/map/hugedata.js
	app/assets/javascripts/map/issue-154-marker-fit.js
	app/assets/javascripts/map/issue-157-ng-click.js
	app/assets/javascripts/map/issue-322.js
	app/assets/javascripts/map/issue-354-window-windows-rerender-content.js
	app/assets/javascripts/map/issue-371-polygon-ng-repeat.js
	app/assets/javascripts/map/issue-382-window-windows-ng-show.js
	app/assets/javascripts/map/issue-393-cluster-events-mapped.js
	app/assets/javascripts/map/issue-432-markers-fit-clustering.js
	app/assets/javascripts/map/issue-482-markers-animation-clustering.js
	app/assets/javascripts/map/issue-482-markers-animation.js
	app/assets/javascripts/map/issue-484-markers-self.js
	app/assets/javascripts/map/issue-495-polyline-fit.js
	app/assets/javascripts/map/issue-498-marker-move-loaded.js
	app/assets/javascripts/map/issue-504-markers-flash.js
	app/assets/javascripts/map/issue-507-windows-show-w-marker-broken.js
	app/assets/javascripts/map/issue-522-polyline-no-paths.js
	app/assets/javascripts/map/issue-534-markers-child-destroy.js
	app/assets/javascripts/map/issue-538-window-plus1.js
	app/assets/javascripts/map/issue-545-marker-flash.js
	app/assets/javascripts/map/issue-621-owl-w-window.js
	app/assets/javascripts/map/issue-621-owl.js
	app/assets/javascripts/map/issue-622-many-markers-destroy.js
	app/assets/javascripts/map/issue-624-drawing-manager.js
	app/assets/javascripts/map/issue-654-marker-events-break-after-added.js
	app/assets/javascripts/map/issue-663-marker-events-once.js
	app/assets/javascripts/map/issue-686-window-options.js
	app/assets/javascripts/map/issue-725-polyline-dupes.js
	app/assets/javascripts/map/issue-728-windows-angular-1_3.js
	app/assets/javascripts/map/issue-74-markers-events.js
	app/assets/javascripts/map/issue-751-783-marker-coords-undefined-dragg.js
	app/assets/javascripts/map/issue-753-marker-not-watched.js
	app/assets/javascripts/map/issue-755-ng-router.js
	app/assets/javascripts/map/issue-772-info-window-show-state.js
	app/assets/javascripts/map/marker-anchor.js
	app/assets/javascripts/map/overlay-map-type.js
	app/assets/javascripts/map/search-box.js
	app/assets/javascripts/map/shapes-lines.js
	app/assets/javascripts/map/two-maps.js
Merge branch 'master' of https://github.com/helaaura/MyTripMap

Conflicts:
	app/models/album.rb
	app/models/location.rb
	app/views/maps/index.html.erb
	config/routes.rb
	db/schema.rb
	test/fixtures/albums.yml