Nouveau système de génération
Merge branch 'feature-collision' of https://github.com/fabienpinel/DevintAndroid into feature-collision

Conflicts:
	src/com/polytech/devintandroid/GameLoop.java
Merge branch 'feature-collision' of https://github.com/fabienpinel/DevintAndroid into feature-collision