Mise a jour

Signed-off-by: thannous <thannous@gmail.com>
Merge branch 'master' of https://github.com/thannous/sante

Conflicts:
	.gitignore
	AndroidManifest.xml
	libs/android-support-v4.jar
	res/values/strings.xml
	res/values/styles.xml
	src/com/cloudtech/sante/MainActivity.java