The merge

This merges master and bootstrap3 together, as well as work today to fix displaying error messages in the UI for forms. It is running on http://teststrap.herokuapp.com as the bare scaffolded result.

Replaces & fixes issues/747
Adds a errors_span helper for displaying validation messagess
Adds new generated classes to forms based on resource and column name
Merges master with bootstrap3