Merge branch 'release/2.1.0' into develop

* release/2.1.0:
  Update of CHANGELOG.md
Merge branch 'hotfix/2.1.1' into develop

* hotfix/2.1.1:
  Updates CHANGELOG.md
  Saving 'applyAssets' setting while updating version info
Adding current branch name to git commit info
Updates CHANGELOG.md
Merge branch 'release/2.2.0'

* release/2.2.0:
  Updates CHANGELOG.md
  Adding current branch name to git commit info