Button for accept deny invitation working
fix sendOrder

xiaokai
fix no dishes error

xiaokai
Login, network errors, prices per personnes
Pictures ! Pictures everywhere !
define new adapter of dishlist

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

Conflicts:

	app/src/main/java/com/uliamar/restaurant/app/controller/OrderEditActivity.java
	app/src/main/res/layout/activity_order_edit.xml
	app/src/main/res/layout/dishe_item_list.xml
add delete dishes

and i will find bueatiful icons later
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
Merge remote-tracking branch 'upstream/master'
fix a  problem when click notification