to be continued
done
Merge remote-tracking branch 'remotes/origin/spring'
merge from branch spring
Conflicts:
	pom.xml
	src/main/webapp/client.js
	src/main/webapp/frame.jsp
	src/main/webapp/im.jsp
add .gitignore file
fix a bug(#who)