Merge branch 'hotfix/Add_to_Gitignore'
Merge branch 'master' into develop