arrows++
Merge branch 'master' into remy

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