Fix broken templates
Bump version, Update changelog
Merge branch 'release/1.0.2'
Merge tag '1.0.2' into develop

Release 1.0.2