Merge branch 'hotfix-1.0.3'
Merge branch 'develop'
Set caching on views
Merge branch 'hotfix/views-caching' into develop