troy commit
troy
Merge branch 'master' of https://github.com/kouhongyu/test-repo

Conflicts:
pom.xml
Revert "Merge branch 'master' of https://github.com/kouhongyu/test-repo"

This reverts commit 0cce8f01a3b169444cb119b402cc20ee81d0e483.
Revert "troy"

This reverts commit 5b9d8f7a9e88266ca9dab71f1622ba1e2902668e.
Merge branch 'master' of https://github.com/kouhongyu/test-repo

Conflicts:
	pom.xml