update
Merge branch 'master' of https://github.com/CloudEDU/CloudEDUServer

Conflicts:
	CloudEDUServer/Web.config