Creation of feature-3
Adding things to feature-3
Last changes in feature-3 before release-1.1
small bugfix
Fixing the merging conflict. Nothing changed, just removing the >>>>