need comit
Merge branch 'master' of https://github.com/zhMady/JM

Conflicts:
	.gitignore
	jm-core/pom.xml