Personal Markers and Global Markers
Merge branch 'Annotations'
v1.10.3: Single player mode now possible