This just updates the code to the current master, so it can be merged easily. Conflicts: overviewer_core/aux_files/genPOI.py