Delete .gitignore
Merge branch 'feature/module'
Merge branch 'master' into develop