Merge branch 'hotfix/bug-1'
Merge branch 'release/1.0'
Merge branch 'release/1.1'
SE-3:
SE-3: add the file1 to the hotfix
Added the correct author and email
Merge branch 'hotfix/SE-3' into develop

* hotfix/SE-3:
  SE-3: add the file1 to the hotfix Added the correct author and email
  SE-3: