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

Conflicts:
	src/com/GroupTree/dao/impl/GroupDAOImpl.java
Signed-off-by: owenxu10 <owenxu10@yahoo.com.cn>