fixed merge conflict, added database migrations, models and fair trade seed data