aaa
Merge branch 'master' of https://github.com/VictorChenLi/BatonPublic.git

Conflicts:
	target/classes/META-INF/maven/BatonPublic/BatonPublic/pom.properties