Merge branch...

Merge branch '139-subjects-with-flying-team-location-should-have-default-flying-team-location-defined' into 'master'

Resolve "subjects with flying team location should have default flying team location defined"

Closes #139

See merge request !62