Merge branch 'master' into develop
adds MiniMapless code
Merge branch 'feature/import-code'