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

Conflicts:
	server.js
Merge branch 'master' of https://github.com/bbkedu/IMC-Designer
fix