updated admin_user model
Merge branch 'master' of https://github.com/tianxind/cpwiki
fixed foreign key
fixed conflicts