Merge branch 'hotfix-0.1.2'
Merge branch 'release-1.0'
Merge branch 'master' of github.com:michelgrootjans/git_workshop into develop
bumped version to 1.0.1
fixed bug in feature 3
Merge branch 'hotfix-1.0.1' into develop