Added functions for adding markers and centering map.
Moved minimap to index.html.
Resolved merge conflict.
Merge branch 'master' into minimap_test