fix show admin
Merge branch 'dev' into 714_fix_admin
Merge pull request #140 from is-valid/714_fix_admin

714 fix admin