Change to new authentication
Merge branch 'master' of https://github.com/gaodayue/RESTaurant_android

Conflicts:

app/src/main/java/com/uliamar/restaurant/app/controller/LoginActivity.ja
va
	app/src/main/java/com/uliamar/restaurant/app/services/DataService.java