v
Merge branch 'master' of https://github.com/visa188/visa
vv
v
Merge branch 'master' of https://github.com/visa188/visa

Conflicts:
	src/main/resources/conf/jdbc.properties