Added dashboard content
Merge branch 'admin'