add admin views
fix merge conflicts
Merge pull request #12 from garcha/admin_views

Admin views
Merge pull request #13 from garcha/development

push to master