Added admin panel
Merge branch 'admin'