Merge branch 'master' of https://github.com/bbkedu/IMC-Designer
Merge branch 'master' of https://github.com/bbkedu/IMC-Designer

Conflicts:
	server.js
	server/proxy.js
update
update