Fixes NPE when adding player to territory with no active town
Merge branch 'master' into dev

Merging bug fixes