Merge branch 'raysmond'
Merge branch 'raysmond'
update
Merge branch 'guojunshi' of https://github.com/junshiguo/FDUGroup into junshiguo-guojunshi

Conflicts:
	arch/controllers/GroupController.php
Merge branch 'junshiguo-guojunshi'
Merge branch 'master' into raysmond