init commit
feature1
feature2
tijiao
Merge branch 'hotfix/hot2' into develop

Conflicts:
	.classpath
	README.md
	pom.xml
delete target
.gitignore
Merge branch 'release/release1'