change attrbute name

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

Conflicts:
	app/src/main/java/com/uliamar/restaurant/app/model/Dishe.java
Merge branch 'master' of https://github.com/gaodayue/RESTaurant_android