Added user control feature for admin
Merge branch 'development'