gmap added
Merge branch 'gmap' of https://github.com/omg-insa/client into gmap

Conflicts:
	PlanYourParty/src/fr/insalyon/pyp/gui/main/MainActivity.java
Add jar source file
v2 of server
Fix maps
Merge pull request #1 from omg-insa/gmap

Gmap