aligning ratings box
incorporated updates from rebase
updates from merges
Merge pull request #78 from ospreys-2014/model_migration

Model migration