Small changes to association logic
Merge branch 'mvcDevelop' of bitbucket.org:nul/alphaomega into mvcDevelop
Fixed some odd edge cases for the parent combobox
Merge branch 'mvcDevelop' of bitbucket.org:nul/alphaomega into mvcDevelop