model changes to fix incorrect field panel and foreign keys
Merge branch 'master' of github.com:torchbox/verdant-rca