merged in master changes from ryan, mike and added lost of Seed data