added admin views for providers
fixed merge conflict
Merge branch 'phase02-admin-views' into phase02