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 models to relfect new name for join table between plans and guidance groups. fixes #198

ensure correct guidance groups display for plan editing

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

resolved rebase conflicts from merge with development

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

debug for travis

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

change how updating various status indicators are done fixes: https://github.com/DMPRoadmap/roadmap/issues/182

added branding.yml copy to travis file

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

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

fixes 'we're sorry HTTP 500 error' when clicking on the phase tab when editing a template. DMPRoadmap/roadmap#187

fix merge conflicts

change from serialized hash tp just using includes

Replaced I18n.t(...) from controllers. DMPRoadmap/roadmap#98

remove unneeded format constants

Moved Actions, views, and partials for sections/phases/questions/suggested_answers out of templates, and wrote up associated authorization

trying to reduce data access queries. Needs more work

port of plan creation and editing to new data model