NFC fix, Geo hardcoded fix, progressdialog hide
Merge branch 'master' of https://github.com/gaodayue/RESTaurant_android

Conflicts:

app/src/main/java/com/uliamar/restaurant/app/controller/OrderEditActivit
y.java