Merge branch 'master' of https://github.com/benli0822/M2

Conflicts:
	web_avance/assets/js/custom/controller/controller.js
	web_avance/index.html
	web_avance/js/custom/app.js
	web_avance/js/custom/controller/ActionController.js
	web_avance/js/custom/controller/controller.js
Merge branch 'master' of https://github.com/benli0822/M2

Conflicts:
	web_avance/assets/js/custom/controller/controller.js
	web_avance/index.html
	web_avance/js/custom/app.js
	web_avance/js/custom/controller/ActionController.js
	web_avance/js/custom/controller/controller.js