Model associations, groundwork for STL group management
Merge branch 'org-man' of https://github.com/jdeanwaite/eDVR into org-man