Denis

Merging in map.html, none of you touched it so it shouldnt affect any other code.