Modified gitignore
Merge branch 'hotfix/1.1'
Merge branch 'master' into develop