Merge branch 'hotfix/views-caching' into develop
Update feature for new design
Merge pull request #1 from syddjurs/new_develop

Update feature for new design
Merge pull request #2 from syddjurs/develop

merge Develop to master