add new choices to animal migrations
Merge branch 'dev' into invitro
change pk to id to allow sorting in admin
completed updated data-model for invitro data