[TEMP]
Merge branch 'master' of github.com:alex-ception/deadhal

Conflicts:
	src/fr/upem/android/deadhal/maze/LinkedRoom.java
Merge branch 'master' into remy

Conflicts:
	src/fr/upem/android/deadhal/BuilderView.java