Update main.js
test commit
Merge branch 'ktpmsgadmin' of https://github.com/adflowweb/ktpAdmin into
ktpmsgadmin

Conflicts:
	ktpAdmin/WebContent/js/pages/main.js
Merge remote-tracking branch 'origin/ktpmsgadmin'