Merge pull request #1 from lighthouse-labs/feature/9-admin-portal

Feature/9 admin portal
Merge branch 'master' into feature/14-factory-girl