fixed merge conflicts

Fixed failing functional & translation tests

added new create plan page

fixed merge conflict in schema.rb

updated org model's instituions scope to return correct org_type DMPRoadmap/roadmap#150

Merge branch 'remove-settings' into development

Merge branch 'fix-template-controller' into development

Removed remaining pieces of the plan_list settings DMPRoadmap/roadmap#248

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

section association sorted by number rather than id. DMPRoadmap/roadmap#269 ...

Funder and Institution displayed adequately. DMPRoadmap/roadmap#269

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

removed the devise confirmation requirement DMPRoadmap/roadmap#254

Updated tests to work with updated controller

created model for annotation

switched helper scopes to class methods because scopes return all if nothing was found since we were using .first

trying to add default scoping for template

Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development

updated models to relfect new name for join table between plans and guidance groups. fixes #198

Added scoped helper queries that return the current template version, the published template, and the available dmptemplate_ids for a given org

added line to convert User to User.id on plan role assignment functions

Removed exclamation mark from uniq as it modifies the variable directly (instead of copying) and returns nil instead of an empty string if the array is empty

Added line to grab the first phase for the template if none is specified on the record

Merge branch 'development' into development

ensure correct guidance groups display for plan editing

fixes guidance group selection for plans

removed validate on User.password/email from user model because it conflicts with Devise's validation rules

added a test that searches for missing translations. Added specific error messages for model validations. Added some devise controlled error messages to pot/po files DMPRoadmap/roadmap#236

updates to locking mechanism because it ActiveRecord does not catch 2 creates DMPRoadmap/roadmap#241

change docx export to htmltoword. Hopefully fixes: #217

assign permissions on create plan. Fixes: #220