Merged and added the admin dashboard
Merge remote-tracking branch 'origin/development' into jamie_dev
- updated database model