xml-free  spring mvc
Merge branch 'master' of https://github.com/wqli/sample

Conflicts:
	src/main/java/com/disk/dao/UserDAO.java
	src/main/java/com/disk/init/Initializer.java