完善订单模块

完善订单模块
Merge branch 'order'
fixed bugs about Orders module

Conflicts:
	guoli/src/com/guoli/hotel/activity/OrderHotelDetailActivity.java