updated guidance selection to ignore unpublished groups/guidances

updated other controller actions shown to throw error by test, we render phases/admin show from other controllers, so need same instance variables defined

funder guidance now displays on customized templates

Added method to validate answer according to each question format. Partial view for section progress. Eager loading of resources needed to calculate plan and section progress. Refactoring of code for progress plan. DMPRoadmap/roadmap#382 ...

Fixed merge conflict. DMPRoadmap/roadmap#382

onChange event for tinymce at plan answers. Removed unnecessary options passed to tinymce. DMPRoadmap/roadmap#382

Colon separator between Guidance Group name and Guidance name - Fixes #333 ?

updated syntax to allow read-only view of a plan. \n app/views/phases/_answer_form_ro.html.erb probably needs a bigger re-write as the logic is horrendus and it renders the whole thing as a form...but it's not a form because it's read only and it checks to see if it's read only a bunch of times within it. but here's the quick and dirty making it work

Template versioning update.

fixed merge conflict in schema.rb

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

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 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