version 1.0
Initial commit
Merge branch 'master' of https://github.com/metroliu/cmwall_wechat
Merge remote-tracking branch 'remotes/CMwall/master'

Conflicts:
	.mymetadata
	README.md
	WebRoot/WEB-INF/classes/org/dao/Msg.class
	WebRoot/WEB-INF/classes/org/dao/Reply.class
	WebRoot/WEB-INF/classes/org/dao/UserInfo.class
	WebRoot/WEB-INF/classes/org/dboprate/DBoprate.class
	WebRoot/WEB-INF/classes/org/message/resp/BaseMessage.class
	WebRoot/WEB-INF/classes/org/service/CoreService.class
	WebRoot/WEB-INF/classes/org/servlet/MainServlet.class
	WebRoot/WEB-INF/classes/org/servlet/MyLuanchServlet.class
	WebRoot/WEB-INF/classes/org/servlet/QueryAllServlet.class
	WebRoot/WEB-INF/classes/org/servlet/QueryReplyServlet.class
	WebRoot/WEB-INF/classes/org/servlet/QueryUserInfo.class
	WebRoot/WEB-INF/classes/org/servlet/UpdateUserInfo.class
	WebRoot/WEB-INF/classes/org/util/DistanceCalculate.class
	WebRoot/WEB-INF/classes/org/util/MessageUtil$1$1.class
	WebRoot/WEB-INF/classes/org/util/MessageUtil$1.class
	WebRoot/WEB-INF/classes/org/util/MessageUtil.class
	WebRoot/WEB-INF/classes/org/util/Rs2Json.class
	WebRoot/WEB-INF/web.xml
	WebRoot/all_waterfall.jsp
	WebRoot/css/cmwall.css
	WebRoot/css/gradients.css
	WebRoot/css/mypage_detail.css
	WebRoot/css/widgets.css
	WebRoot/index.jsp
	WebRoot/js/ajaxfileupload.js
	WebRoot/js/jquery.uploadify-3.1.min.js
	WebRoot/msg_detail.jsp
	WebRoot/my_luanch.jsp
	WebRoot/mypage_edit.jsp
	WebRoot/mypage_scan.jsp
	src/org/dao/Msg.java
	src/org/dao/Reply.java
	src/org/dao/UserInfo.java
	src/org/dboprate/DBoprate.java
	src/org/message/resp/BaseMessage.java
	src/org/service/CoreService.java
	src/org/servlet/MainServlet.java
	src/org/servlet/MyLuanchServlet.java
	src/org/servlet/QueryAllServlet.java
	src/org/servlet/QueryReplyServlet.java
	src/org/servlet/QueryUserInfo.java
	src/org/servlet/UpdateUserInfo.java
	src/org/util/BcsImgUpload.java
	src/org/util/CompressPicDemo.java
	src/org/util/DistanceCalculate.java
	src/org/util/MessageUtil.java
	src/org/util/Rs2Json.java