chat
Merge remote-tracking branch 'origin/master'

Conflicts:
	war/WEB-INF/web.xml
	war/app/lab/index.jsp