added associations, changed scaffolded views, added migrations