Merge branch 'release/release-1.0'
Merge branch 'release/1.1'
commit everything working
Merge branch 'hotfix/1.1.1' into develop