Signed-off-by: dengqs <dengqs@int-yt.com>
Signed-off-by: mxqx <mxqx@qq.com>
Signed-off-by: dengqs <dengqs@int-yt.com>
Merge branch 'master' of https://github.com/codekitten/buddy.git
Merge branch 'master' into dengqs

Conflicts:
	src/main/java/cn/ac/ict/buddy/mvc/controller/IndexController.java