Merge branch 'master' into test
don't re-render the map
gitignore stuff
Merge branch 'master' into test
fix markers
disable stuff
rerender
render night
render south
Merge branch 'test'