ajout menu slide
Merge branch 'master' of https://github.com/Mikanribu/Ouroboros

Conflicts:
	Ouroboros/gen/epf/domethic/ouroboros/R.java
	Ouroboros/res/layout/activity_hospitalisations.xml
	Ouroboros/res/values/strings.xml

Merge