Added columns to database and initialized.
Change to model, specs and factory.
View and asset changes.
Couple of spec fixes to do with unique risk factors.
Merge branch 'feature/violations' into develop
Merge branch 'release/2013031701'