Merge branch 'hotfix-1.0.1'
bumped version to 1.1
finetuning feature 4
Merge branch 'release-1.1'
starting with feature 6
continuing feature 6
fixed bug
bumped version to 1.1.1
Merge branch 'hotfix-1.1.1' into develop
finished feature 6
Merge branch 'feature6' into develop