Some work on reviews, and deletions of old review-related files not needed anymore
Merge conflicts resolved between Chelsea-local and changes from remote master with order#show instead of order#create
Merge branch 'master' of github.com:daniellecs/project_craig
lots of fixes to views