Merge branch 'develop'
updated .gitignore
Merge branch 'hotfix' into develop