updated phases controller to use error messaging helper. added functional tests for the sections controller

updated phases and templates tests to work with updated error messaging

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

Added new method that assists controllers with error messaging on application_controller

added branding.yml copy to travis file

added tests for phases controller. Added necessary tweaks to correct failure routes within controller actions

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

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

added tests for saving and creating invalid templates

removed exclamation from .save. This prevents the routine from ever returning false

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

fixed the rest of the tests by swapping out I18n and removing locales from routes

fixed some of the failing tests. Commented out helpers/plan_list tests because it relied on old I18n helpers to determine column name

added logic to db/seeds.rb to always create a default org for the one defined in config/branding.yml. This is the managing org

removed branding.yml (branding_example.yml is now in place) and added it to .gitignore

Added example of branding.yml. Added note that the abbreviation listed in branding.yml must match the one in the DB

Merge pull request #40 from DMPRoadmap/development ...

Rebasing

Merge pull request #201 from CDLUC3/template-fixes ...

CDL bug fixes for Template pages

updated section view to call correct partial DMPRoadmap/roadmap#193

fixed typo in partial name DMPRoadmap/roadmap#194

fixed issue with invalid route after creating a section

updated phases controller to allow org admins to update their org's templates DMPRoadmap/roadmap#192

updated templates controller so that editing details does not send user to 'view all templates' page DMPRoadmap/roadmap#192

fixed if statement that allows the editable template details section to appear DMPRoadmap/roadmap#192

fixed typo on admin_add view DMPRoadmap/roadmap#191

switched phase to @phase so that it uses the instance variable DMPRoadmap/roadmap#191

removed auto-creation of phase from templates controller. Updated template view to allow the 'Add Phase' tab to appear if the template.org == current_user.org DMPRoadmap/roadmap#191

Merge pull request #39 from DMPRoadmap/development ...

Latest DCC fixes for bugs on plan pages

Merge pull request #200 from DigitalCurationCentre/development ...

Merge latest DCC changes