Ajout d’une humeur fatigue
Create FakeDataHelper
Started to integrate the sliding menu
Merge branch 'master' of https://github.com/litil/Carpet

Conflicts:
	android/.classpath
	android/bin/CarpetAndroid.apk
	android/bin/classes.dex
	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/activities/WelcomeActivity.class
	android/bin/resources.ap_
	android/gen/com/matelli/carpet/R.java