Merge branch 'master' of https://github.com/xiaohulu/daxueershou

Conflicts:
	src/main/java/com/ershou/mvc/controller/HelloController.java