--dawn version
--merge
--test
--test1
Merge branch 'master' of https://github.com/lydgithub/YueYingServer.git

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/lydgithub/YueYingServer.git