Some fixes, starting use branches
xml commit
Merge branch 'master' into OldMessagesLog

Conflicts:
	.idea/workspace.xml
	out/artifacts/ChatTextToDeployApp/ChatTextToDeployApp.war
	web/index.jsp
xml commit