Signed-off-by: Gokeii <21250546@qq.com>
Merge branch 'master' of https://github.com/Gokeii/GroupTree.git

Conflicts:
	build/classes/applicationContext.xml
	src/applicationContext.xml

Signed-off-by: Gokeii <21250546@qq.com>
Signed-off-by: Gokeii <21250546@qq.com>