a
Merge branch 'master' of https://github.com/774663576/Interestfriend_server

Conflicts:
	WebRoot/WEB-INF/classes/com/interestfriend/smscode/RestTest.class
	src/com/interestfriend/smscode/RestSMSCode.java
Merge branch 'master' of https://github.com/774663576/Interestfriend_server
Merge branch 'master' of https://github.com/774663576/Interestfriend_server