jarrive tjr pas a faire un pull !!
Merge branch 'master' of
https://github.com/smartDringTeam/smart_dring.git

Conflicts:
	Smart_Dring/bin/classes/fr/labofapp/smartdring/activity/ShakeActivity.class
	Smart_Dring/bin/classes/fr/labofapp/smartdring/activity/SleepActivity.class
	Smart_Dring/bin/dexedLibs/android-support-v4-8ea3858a08eeb4933e49f65a31ef2a96.jar