Merge branch 'hotfix/1.0.4-importer_naming'
Merge branch 'release/1.0.5'
Fixed template syntax issue
Bumped version
Merge branch 'hotfix/1.0.6-template-issue' into develop