Merge branch 'integration'
added .settings to gitignore