Commit Bizarre

Il me demande de commiter des trucs bizarres...
Merge branch 'master' of https://github.com/Varkal/M1_ANDROID

Conflicts:
	bin/M1_ANDROID.apk
	bin/classes.dex
	bin/resources.ap_