Merge branch 'master' into develop
Ignore coverage.out
Fix Dockerfile
Move Dockerfile to root
Merge branch 'develop'