Issue 3217: Changes to the entities as discussed on 4/22/2013
Merge branch 'master' of https://github.com/mschwa/active-review