commit
Merge branch 'remy'

Conflicts:
	src/fr/upem/android/deadhal/BuilderView.java
	src/fr/upem/android/deadhal/GameView.java
resolve
Merge branch 'master' of github.com:alex-ception/deadhal
[BUG] CAN LOAD TWO MAPS