no message
Merge branch 'master' of https://github.com/litil/Carpet

Conflicts:
	android/bin/classes/com/matelli/carpet/activities/EnfantActivity$5.class
	android/bin/classes/com/matelli/carpet/activities/EnfantActivity.class
Merge branch 'master' of https://github.com/litil/Carpet

Conflicts:
	android/bin/CarpetAndroid.apk
	android/bin/classes.dex
	android/bin/classes/com/matelli/carpet/game/ResourcesManager.class
	android/bin/classes/com/matelli/carpet/game/Scene/GameScene.class
	android/bin/resources.ap_