Initial commit
Update .gitignore
update from office
Merge origin/master
client Test project java simple application
Merge origin/master

Conflicts:
	.gitignore
	README.md