Merge branch 'development' into CDL-MVP ...

Backporting bugfixes. db:migrate needs to be run to add new indices.

updated templates_controller_test to validate new assumption that customizations are dirty

fixed tests DMPRoadmap/roadmap#175

updated tests to work with new standardized success messages DMPRoadmap/roadmap#175

Update templates_controller_test.rb

Update templates_controller_test.rb

Template versioning update.

removed debug lines from template test

fixed issue with template test

moved some of the logic that was defaulting template attributes in the controller over to the model. Fixed tests DMPRoadmap/roadmap#251 DMPRoadmap/roadmap#273

fixed pages so that they work with new controller logic DMPRoadmap/roadmap#251

updated tests to work with new template logic DMPRoadmap/roadmap#251

Updated tests to work with updated controller

Updated test so that it does not provide a version or org so that we match what the form is doing DMPRoadmap/roadmap#191

broken generic error message handler apart into separate create/update/destroy versions. updated calls within the controllers and fixed tests DMPRoadmap/roadmap#227

added checks to make sure records are actually created/updated/deleted

added hack to override the application controller's current_user since its nil in the controller and causing policy check to fail in Travis

removed 'first' invocation from @template in controller tests

template being used to create user on template,phase,section,question and guidance_group controller tests did not match the scaffolded template

added require statement for test_helper into all functional tests

added tests for guidance_group controller and added method to test helper to get org admin DMPRoadmap/roadmap#212

added initial tests for guidance_groups_controller

updated phases and templates tests to work with updated error messaging

added generic 'Unable to save your changes' message for template create/update failures

finished tests for invalid objects and added notes to have us add proper error messaging later on

added tests for saving and creating invalid templates

updated seeds to use managing institution abbreviation instead of hard-coded 'CC'. Added basic functional tests for templates controller with small adjustments to check for nils in view and controller