misc changes
Merge branch 'master' into brian
minimap start position fix
more text edit updates
Merge remote-tracking branch 'origin/master' into kilian