j
Merge branch 'master' of git@github.com:JamesJiangCHN/production_mvn.git

Conflicts:
	production/target/m2e-wtp/web-resources/META-INF/maven/cn.com.windit/production/pom.properties
改变c3p0位置