Merge branch 'dev' into feature/qa
Use respond_with to DRY up code for non-GET methods in controllers
Merge branch 'feature/qa' into dev
Merge branch 'dev' into feature/simpleform