Merge branch 'release-1.0' into develop
Merge branch 'hotfix-1.0' into develop
Added feature 4
Merge branch 'feature_4' into develop
Merge branch 'develop'