Commit and push 30/04/13
Merge remote-tracking branch 'origin/activitiesRobin'
push de fin de journée
Merge branch 'master' of https://github.com/FHachez/restaurantApp.git

Conflicts:
	restaurantApp/gen/com/example/restaurantapp/R.java