Horaires et conges activités
Merge remote-tracking branch 'origin/activitiesRobin'

Conflicts:
	restaurantApp/gen/com/example/restaurantapp/R.java
	restaurantApp/res/layout/activity_pagede_restaurannt.xml
	restaurantApp/res/values/strings.xml