bugs fixed in admin previlage
Merge branch 'master' into admin_previlage