更改api签名添加
for pull
Merge branch 'master' of github.com:CloudEDU/CloudEDUServer

Conflicts:
	CloudEDUServer/adminconsole/Default.aspx