修改过的课进行颜色显示，并且对整体code进行格式化
Merge branch 'master' of https://github.com/benli0822/M2

Conflicts:
	web_avance/assets/js/custom/controller/loginController.js
oti seance 2