Merge branch 'player_marker' of https://github.com/JonnyJD/Minecraft-Overviewer into devel Conflicts: genPOI.py overviewer_core/data/js_src/views.js
Merge branch 'player_marker' of https://github.com/JonnyJD/Minecraft-Overviewer into devel Conflicts: genPOI.py overviewer_core/data/js_src/views.js