Added test marker to minimap.
Added example for loading JSON for markers.
Merge branch 'master' into minimap_test
Fixed mockup after master merge.