new file:   res/layout/index_recommend.xml
	modified:   res/layout/smile_main.xml
	modified:   src/com/holding/smile/activity/LoginActivity.java
	modified:   src/com/holding/smile/activity/MainActivity.java
	modified:   src/com/holding/smile/myview/MyListView.java
	modified:   src/com/holding/smile/myview/PullToRefreshView.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/src/com/holding/smile/activity/MainActivity.java

	modified:   ../smile/src/main/java/com/flyhz/shop/service/UserService.java
	modified:   ../smile/src/main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	modified:   ../smile/src/main/java/com/flyhz/shop/web/controller/LoginController.java
	modified:   ../smile/src/main/java/com/flyhz/shop/web/controller/UserController.java
	modified:   AndroidManifest.xml
	modified:   src/com/holding/smile/activity/LoginActivity.java
	modified:   src/com/holding/smile/activity/MainActivity.java
	modified:   src/com/holding/smile/service/LoginService.java