fixed errors in fixtures, added columns needed for associations, run migration
prepering for merge
merged
brace for impact
merged