Insertion des annotations sur la maps global
Fin maps
Merge branch 'feature-map' into develop

Conflicts:
	VelibApp/VelibApp/Base.lproj/Main.storyboard