ajout mapview
Merge branch 'master' of https://github.com/studel/GEMAG

Conflicts:
	gemag/gemag/en.lproj/Storyboard.storyboard