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