修正popover行为
修改外观
Merge branch 'master' of https://github.com/benli0822/M2

Conflicts:
	web_avance/assets/js/custom/controller/loginController.js
	web_avance/index.html