--recommit
Merge branch 'master' of https://github.com/zhuwb/study.git

Conflicts:
	src/main/java/cn/ether/controller/UserController.java