l
Merge branch 'master' of https://github.com/gaodayue/RESTaurant_android

Conflicts:

app/src/main/java/com/uliamar/restaurant/app/services/RESTrepository.jav
a