Changes to be committed:
	modified:   ../../smile/src/main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   ../AndroidManifest.xml
	modified:   layout/footer.xml
	modified:   ../src/com/holding/smile/activity/MyOrdersActivity.java
	modified:   ../src/com/holding/smile/adapter/MyOrdersAdapter.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/res/layout/footer.xml