Merge pull request #4 from jefBinomed/master

merge
bugs
Merge branch 'master' of https://github.com/goplaysomewhere/GPSapp

Conflicts:
	www/partials/game/game.html
Merge pull request #5 from jefBinomed/master

mise en place de maps
commit map-service
Merge pull request #6 from jefBinomed/master

mise en place base et base enemies
merge
Merge pull request #7 from jefBinomed/master

deplacement d'un attaquant
CORDOVA FUNCTIONNE BORDEL DE MERDE
Merge pull request #8 from kelle62819/master

CORDOVA FUNCTIONNE BORDEL DE MERDE
Merge remote-tracking branch 'upstream/master'
Add init map features
Merge pull request #9 from adrienbarreau/master

Autorise moi stp :)
merge du taff de jeff
Merge remote-tracking branch 'upstream/master'
merge
Merge branch 'adrienbarreau-master'