temp
Merge branch 'master' into remy
Display using maze
Merge branch 'master' into alex

Conflicts:
	src/fr/upem/android/deadhal/BuilderActivity.java
[FEATURE][TEMP] Load