Ino user
Merge branch 'master' of https://github.com/timmy78/restaurant

Conflicts:
	src/com/exercice/tprestaurant/backend/data/User.java
	src/com/exercice/tprestaurant/ui/maintabs/MainTabsActivity.java