updated
Merge branch 'master' of https://github.com/lslsheng/285p4

Conflicts:
	SeverGui/bin/.gitignore
	SeverGui/bin/JvodInfrastructure/Handlers/ResponseHandler.class