Merge branch 'hotfix-1.0.1'
Merge branch 'develop'
Merge pull request #2 from tthbellcom/master

Merge thh changes.
Set caching on views
Merge branch 'hotfix/views-caching' into develop