Adding plots didn't check for an active town
Merge branch 'dev_bugfix' into dev
Merge bug fix