Corrections in gitignore
Merge branch 'wip'
Branch "master" specifics
Merge branch 'master' into dev