Merge branch 'release/0.1.1' into develop
Added some missing template tags
Merge branch 'feature/admin-template-object-items' into develop
Merge branch 'develop'