sd
Merge branch 'master' of https://github.com/xxdeyy/wxsb.git

Conflicts:
	wxsb/pom.xml
	wxsb/src/main/resources/db-config.xml