modified:   ../AndroidManifest.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   java/com/flyhz/framework/util/Constants.java
	modified:   java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   java/com/flyhz/shop/service/impl/ShoopingCartServiceImpl.java
	modified:   ../../../smile_android/AndroidManifest.xml
	deleted:    ../../../smile_android/res/drawable-hdpi/welcome.jpg
	new file:   ../../../smile_android/res/drawable-hdpi/welcome.png
	modified:   ../../../smile_android/res/layout/index.xml