Modify
Merge branch 'master' of github.com:m80126colin/NewsLine

Conflicts:
	Public/custom/js/index.js