add map to main page
something else changed
Merge remote-tracking branch 'origin/master'