Merge branch 'master' of https://github.com/icejoywoo/commons-demo

Conflicts:
	pom.xml
	src/test/java/com/icejoywoo/commons/MainTest.java