.
.
Merge branch 'master' of github.com:GuillaumeLegendre/escapeir-android

Conflicts:
	EscapeIR-Android/src/fr/umlv/escape/editor/EditorLevelActivity.java