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

Conflicts:
	src/org/hennet/androidproject/MainActivity.java
	src/org/hennet/androidproject/jeu/Jeu.java
avoid auto pause