modified:   smile/src/main/java/com/flyhz/framework/lang/SolrData.java
	modified:   smile/src/main/java/com/flyhz/shop/build/solr/SolrDataImpl.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/res/values/strings.xml
	smile_android/src/com/holding/smile/service/DataService.java

	new file:   smile_android/res/drawable-hdpi/loading.jpg
	modified:   smile_android/res/layout/base.xml
	new file:   smile_android/res/layout/order_pay_view.xml
	modified:   smile_android/res/values/strings.xml
	modified:   smile_android/res/values/styles.xml
	modified:   smile_android/src/com/holding/smile/activity/OrderInformActivity.java
	new file:   smile_android/src/com/holding/smile/activity/OrderPayActivity.java
	modified:   smile_android/src/com/holding/smile/adapter/MyOrderInformAdapter.java
	modified:   smile_android/src/com/holding/smile/service/DataService.java