Intégration info de santé
Merge branch 'master' of https://github.com/thannous/sante

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of https://github.com/thannous/sante