removed admin column from users and updated seed file
updated fixtures and seeds
updating capybara tests
Merge branch 'master' into itemmodeltestupdate