Merging release-1.1 into develop
Small change directly on develop
Adding content to feature-4
Merge branch 'feature-4' into develop
Merging the feature-4
Correcting some small bugs [release-1.2]
Merge branch 'release-1.2'
Merging to create version 1.2