Merge branch 'master' of https://github.com/acoreful/java-uitls.git

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/acoreful/java-uitls.git