Merge branch 'master' of https://github.com/Ellery0924/myUtil

Conflicts:
	WebContent/js/main.js