added uid validation to order model, continued capybara tests
Merge branch 'master' into itemmodeltestupdate