Merge branch 'CDL-MVP' into CDL-MVP

Change flash notice to alert for error

Adds copy template option #148

updated controllers to use alert instead of notice for errors DMPRoadmap/roadmap#175

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

funder guidance now displays on customized templates

updated admin_index for templates to not bug for some orgs, reimplimented logic for transfering customizations, changed text according to #338

updated routes from put to get for admin_customize, addresses part of #370

updated org-admin and plan create pages to reflect schema change

Integrate/resolve PR #319 - Closes #251.

Template versioning update.

Merge branch 'development' into template-publish-fix

updated template processing so that a new version is created when the user edits a published version. Updated tests to work with this new paradigm

updated tests to work after annotations changes

merged development into annotations

began updating org-admin display of suggested_answers

Fixes to view templates and the way templates are collected DMPRoadmap/roadmap#251

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

moved most of the save logic from the template controller to the model. Updated the phases/section/question models to use the after_save callback to handle updating the template.dirty flag

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 template controller to use new model helper methods. updates phase/section/question controllers to update template dirty flag. added new routes for customize, publish, unpublish

updated logic to unpublish older versions when a version is published

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 obj_name param to the generic error message handler on application_controller. Updated all save error handling to render the page rather than redirect DMPRoadmap/roadmap#227

updated phases and templates controllers to use new error message helper on application_controller

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

fixed broken route to undefined edit path and replaced with redirect to correct route