loader for map
Merge branch 'master' into nico-front-end
loader for map