Feature/entity models

In order to begin work on feature/auth_views, we need to incorporate the bcrypt fixes in Feature/entity_models.