init
Merge branch 'master' of https://github.com/zangxiaoqiang/MiniCommon.git

Conflicts:
	pom.xml