Add dashboard
Merge branch 'admin'