Merge pull request #23 from magicHu/0f7c3e0feacd4aaa5a964720b466aed243b0cd48

不知道为什么，提交了两次
Merge pull request #22 from magicHu/beae2ad152217aedd3019e06a10aa2d1ac71a3a2

支持前端用户注册，及admin登录
crud user in admin
Merge branch 'master' of https://github.com/magicHu/peafowl