some modifs
Merge branch 'master' of https://github.com/juh31/AndroidProject

Conflicts:
	res/xml/map.xml
	src/org/hennet/androidproject/jeu/Jeu.java
splashscreen on touch working