aa
sdfds
Merge https://github.com/Raysmond/FDUGroup
Merge branch 'raysmond'
Merge branch 'raysmond'
update
Merge https://github.com/Raysmond/FDUGroup

Conflicts:
	arch/controllers/UserController.php
delete files
add useredit view
Merge pull request #26 from zyz282994112/zyz

add useredit view
Merge branch 'master' into raysmond