Merge branch 'master' into develop
Finished feature2
Merge branch 'feature/2' into develop
Fixed bug
Merge branch 'release-0.1'