commit
commit
commit
commit
commit
fdsds
commit
Merge branch 'master' of https://github.com/f1008611/WEB-SMVC.git

Conflicts:
	src/main/resources/config/db.xml