modified:   src/main/java/com/flyhz/framework/lang/RedisRepository.java
	modified:   src/main/java/com/flyhz/framework/lang/file/FileRepository.java
	modified:   src/main/java/com/flyhz/framework/lang/file/FileRepositoryImpl.java
	modified:   src/main/java/com/flyhz/shop/build/solr/SolrDataImpl.java
	modified:   src/main/java/com/flyhz/shop/persistence/RedisRepositoryImpl.java
	modified:   src/main/java/com/flyhz/shop/service/impl/IdcardServiceImpl.java
modified:   src/main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   src/main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	modified:   src/main/java/com/flyhz/shop/service/impl/VersionServiceImpl.java
	modified:   src/main/java/com/flyhz/shop/web/controller/IdcardController.java
	modified:   ../smile_android/res/drawable-hdpi/ic_launcher.png
	new file:   ../smile_android/res/drawable-ldpi/ic_launcher.png
	modified:   ../smile_android/res/drawable-mdpi/ic_launcher.png
modified:   ../smile_android/res/drawable-xhdpi/ic_launcher.png
	modified:   ../smile_android/res/drawable-xxhdpi/ic_launcher.png
	modified:   ../smile_android/res/layout/header.xml
	modified:   ../smile_android/res/layout/search_header.xml
	modified:   ../smile_android/res/values/strings.xml
	modified:   ../smile_android/src/com/holding/smile/activity/LoginActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz