map's location restored; markers added
Merge branch 'plain' of github.com:libnull/sml-uy into plain

Conflicts:
	index.html