Merge branch 'hotfix/v1.0.2'
Finally
Merge branch 'master' into develop
Version bump
I'm done here
Merge branch 'hotfix/v1.0.3'
Merge branch 'hotfix/v1.0.3' into develop

Conflicts:
	generate/src/sass/style.scss
Merge branch 'master' into develop