deleted:    smile_android/obj/local/armeabi/objs/m/m.o
	deleted:    smile_android/obj/local/armeabi/objs/m/m.o.d
	modified:   smile_android/project.properties
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	new file:   smile/src/main/java/com/flyhz/shop/persistence/dao/ActivityDao.java
	new file:   smile/src/main/java/com/flyhz/shop/persistence/entity/ActivityModel.java
	modified:   smile/src/main/java/com/flyhz/shop/service/impl/BuildServiceImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/web/controller/BuildController.java
	modified:   smile/src/main/resources/mybatis/sqlMapConfig.xml
	new file:   smile/src/main/resources/mybatis/sqlmap/ActivityMapper.xml
	modified:   smile/src/main/resources/spring/applicationContext-dao.xml
	modified:   smile_android/proguard-project.txt
	new file:   smile_android/proguard/dump.txt
	new file:   smile_android/proguard/mapping.txt
	new file:   smile_android/proguard/seeds.txt
	new file:   smile_android/proguard/usage.txt
	modified:   smile_android/res/layout/idcard_edit.xml
	modified:   smile_android/src/com/holding/smile/activity/IdcardEditActivity.java
	modified:   smile_android/src/com/holding/smile/activity/WebViewActivity.java
	modified:   smile_nodejs/requestHandlers.js
Merge branch 'master' of https://github.com/rememberlostcode/flyhz