Model updates also included now. Fixed associations and default values for who-did-it behaviour.
Authored by: gdbryant 2012-02-20
Parent: [r5]
Child: [r7]