merge
Merge branch 'master' of github.com:brainshawn/107room

Conflicts:
	.gitattributes
	README.md
	src/main/resources/log4j.properties
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/index.jsp