Merge branch 'release/jimmy-1.0' into develop

* release/jimmy-1.0:
  release-1.0 commit 2
  release-1.0 first commit
feature_3 commit 1
release 1.1 commit 1
Merge branch 'release/jimmy-1.1'

* release/jimmy-1.1:
  release 1.1 commit 1
  feature_3 commit 1