Design fragment
Design fragment Menu Hospitalisations
Merge branch 'master' of https://github.com/Domethic/MeData

Conflicts:
	AndroidManifest.xml
	res/values/dimens.xml
	res/values/strings.xml
	src/medata/activities/PatientProfileActivity.java
Résolution conflit