Add dashboard.
Add user admin.
Merge branch 'admin'

Merged 'master' branch w/ 'admin' branch