Merge branch 'release/v2.2.1' into develop
added .settings to .gitignore
Merge branch 'develop'