to merge
Merge branch 'master' of https://github.com/Ivan0905/idChat-Server

Conflicts:
	.idea/workspace.xml