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

Conflicts:
	android/bin/CarpetAndroid.apk
	android/bin/classes.dex
	android/bin/resources.ap_
no message
Merge branch 'master' of https://github.com/litil/Carpet

Conflicts:
	android/bin/CarpetAndroid.apk
	android/bin/classes.dex
	android/bin/classes/com/matelli/carpet/activities/EnfantActivity.class
	android/bin/classes/com/matelli/carpet/game/ResourcesManager.class
	android/bin/classes/com/matelli/carpet/game/Scene/BaseScene.class
	android/bin/classes/com/matelli/carpet/game/Scene/GameScene.class
	android/bin/classes/com/matelli/carpet/game/Scene/SceneManager$SceneType.class
	android/bin/classes/com/matelli/carpet/game/Scene/SceneManager.class
	android/bin/classes/com/matelli/carpet/game/Scene/SplashScene.class
	android/bin/resources.ap_
Merge branch 'master' of https://github.com/litil/Carpet

Conflicts:
	android/bin/classes/com/matelli/carpet/services/LocationService.class