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

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

Conflicts:
	android/bin/CarpetAndroid.apk
	android/bin/classes.dex
	android/bin/classes/com/matelli/carpet/R$attr.class
	android/bin/classes/com/matelli/carpet/R$dimen.class
	android/bin/classes/com/matelli/carpet/R$drawable.class
	android/bin/classes/com/matelli/carpet/R$id.class
	android/bin/classes/com/matelli/carpet/R$layout.class
	android/bin/classes/com/matelli/carpet/R$menu.class
	android/bin/classes/com/matelli/carpet/R$string.class
	android/bin/classes/com/matelli/carpet/R$style.class
	android/bin/classes/com/matelli/carpet/R.class
	android/bin/classes/com/matelli/carpet/activities/ConducteurActivity.class
	android/bin/classes/com/matelli/carpet/activities/EnfantActivity.class
	android/bin/classes/com/matelli/carpet/activities/WelcomeActivity.class
	android/bin/dexedLibs/android-support-v4-54822bcd45a1de7116661a6cd1937fb0.jar
	android/bin/jarlist.cache
	android/bin/resources.ap_
	android/gen/com/matelli/carpet/R.java
Mise en place service location
Merge branch 'master' of https://github.com/litil/Carpet

Conflicts:
	android/AndroidManifest.xml
	android/bin/AndroidManifest.xml
	android/bin/CarpetAndroid.apk
	android/bin/classes.dex
	android/bin/classes/com/matelli/carpet/R$string.class
	android/bin/classes/com/matelli/carpet/R$style.class
	android/bin/classes/com/matelli/carpet/activities/WelcomeActivity$1.class
	android/bin/classes/com/matelli/carpet/activities/WelcomeActivity$2.class
	android/bin/classes/com/matelli/carpet/activities/WelcomeActivity.class
	android/bin/classes/com/matelli/carpet/application/CarpetApplication.class
	android/bin/dexedLibs/andengine-5724e13bd10b1ca80a12cf892b3f03dd.jar
	android/bin/dexedLibs/android-support-v4-54822bcd45a1de7116661a6cd1937fb0.jar
	android/bin/dexedLibs/guice-3.0-no_aop-a0ba82989af3184f955b90a93d6aad0d.jar
	android/bin/dexedLibs/javax.inject-1-ace0d402e9df51522ec38284044234b4.jar
	android/bin/dexedLibs/jsr305-1.3.9-419f9797a4c9c7ef40ceb6e3e63581c0.jar
	android/bin/dexedLibs/roboguice-2.0-4cbe23d8edd31a11216b5d6e6ccc573b.jar
	android/bin/resources.ap_
	android/gen/com/matelli/carpet/R.java
	android/src/com/matelli/carpet/activities/WelcomeActivity.java
	android/src/com/matelli/carpet/application/CarpetApplication.java
no message