Merge branch 'hotfix-1.0.6'
Merge remote-tracking branch 'origin/hotfix-1.0.7'
Merge branch 'develop'
Set caching on views
Merge branch 'hotfix/views-caching' into develop