Styling to prevent trimming nickname
Merge branch 'hotfix/v1.01' into develop
Added missing new styles
Merge branch 'hotfix/v1.0.2' into develop
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
Here we go again with css files from build