t
t
Merge branch 'master' of https://github.com/visa188/visa.git

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