更换架构
Merge branch 'master' of https://github.com/chinaboard/CBRemoteControl

Conflicts:
	CBRemoteControl.Server/app.config