finished writing tests
Merge branch 'feature/cms' into develop

CMS functionality finished but could be refactored further.
Merge branch 'develop' of https://github.com/krisquigley/hotelsindex-content-cms into develop
Conflict issues