Merge branch 'develop' of github.com:walmartlabs/hapi into user/eran
Views refactor
Merge branch 'develop' of github.com:walmartlabs/hapi into user/eran
Merge pull request #348 from walmartlabs/user/eran

View refactor
Merging upstream