Additional person/door group fixes. TODO: refresh on all changes correctly
Merge branch 'master' of https://github.com/patchcr/ReganRyanSoftwareEngineering