modified:   smile/src/main/java/com/flyhz/shop/dto/ProductDto.java
	modified:   smile/src/main/java/com/flyhz/shop/persistence/RedisRepositoryImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/persistence/entity/ProductModel.java
	modified:   smile/src/main/java/com/flyhz/shop/web/controller/LoginController.java
	modified:   smile/src/main/resources/mybatis/sqlmap/ProductMapper.xml
	modified:   smile_android/AndroidManifest.xml
	modified:   smile_android/res/layout/footer.xml
	modified:   smile_android/res/layout/login.xml
	new file:   smile_android/res/layout/register.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/res/values/strings.xml

	new file:   smile_android/res/drawable-hdpi/add_btn.png
	new file:   smile_android/res/drawable-hdpi/confirm_btn.png
	new file:   smile_android/res/drawable-hdpi/sub_btn.png
	new file:   smile_android/res/drawable/text_view_bg.xml
	modified:   smile_android/res/layout/order_inform_view.xml
	modified:   smile_android/res/layout/order_item.xml
	modified:   smile_android/res/values/strings.xml
	modified:   smile_android/res/values/url.xml
	modified:   smile_android/src/com/holding/smile/activity/OrderInformActivity.java
	modified:   smile_android/src/com/holding/smile/adapter/MyOrderInformAdapter.java
	modified:   smile_android/src/com/holding/smile/dto/ProductDto.java
	modified:   smile_android/src/com/holding/smile/dto/RtnValueDto.java
	new file:   smile_android/src/com/holding/smile/protocol/PProduct.java
	modified:   smile_android/src/com/holding/smile/service/DataService.java
	deleted:    1