Remove directory
Merge branch 'master' into develop
Fix untracked files