Modification barre du haut
Merge branch 'master' of https://github.com/Mikanribu/Ouroboros

Conflicts:
	Ouroboros/gen/epf/domethic/ouroboros/R.java
	Ouroboros/src/epf/domethic/ouroboros/activity/HospitalisationsActivity.java