remove fbone cruft
initial merge csik models
cruft remove
initial foreign key fields and forms