修改pom文件
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
优化配置信息读取，分test,product,development