backup 0915
 new ui
Merge remote-tracking branch 'origin/lichen' into ccs

Conflicts:
	res/layout/order_dev.xml
	src/com/crazy/easy/order/OrderController.java