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

Conflicts:
	ktpAdmin/WebContent/js/pages/main.js