#10  gui transform unfinishe
Merge branch 'master' of https://github.com/ZJU-BME-VICO/clever-managment
# gui transform finish 3 types
Merge branch 'master' of https://github.com/ZJU-BME-VICO/clever-managment

Conflicts:
	clever-management-web/src/main/webapp/WEB-INF/js/app.js