..
Merge branch 'master' of https://github.com/daqingllm/hailume

Conflicts:
	src/main/java/me/hailu/controller/IndexController.java