Merge branch 'release/1.0'
Merge commit 'a1391f6eacd5a42db169e193554b7fee44d9eb1a' into release
Merge branch 'develop' into release
rem 4 from release
Merge remote-tracking branch 'origin/develop' into release

* origin/develop:
  6
Merge branch 'develop' into release
Merge commit '7f056689591a9931718a10ad488601003bcd3e05' into release/1.2
Merge branch 'release/1.2' into integration
14
Merge branch 'develop' into integration
remove files not needed
notes
15