Finished map loader
Solved filter conflict
Merge remote-tracking branch 'origin/master' into Hex-fix
Default map added