fixed merge conflict in schema.rb

Merge pull request #279 from CDLUC3/development ...

Latest bug fixes from CDL

removed the current migration for annotations as they were introduced earlier in migration process

added new css and js files to go with create plan page. css should be used for all new ui work going forward DMPRoadmap/roadmap#150

replaced old create plan page with new, cleaner html version DMPRoadmap/roadmap#150

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

Updated plans_controller and test to work with new create plan workflow DMPRoadmap/roadmap#150

added the new jquery-accessible-autocomplete JS widget DMPRoadmap/roadmap#124

commented out plan creation integration test. the workflow will be changing soon

debug line for travis.ci issue

debug line for travis.ci issue

debug line for travis.ci issue

debug line for travis.ci issue

fixed integration tests for templates

removed debug lines from template test

fixed issue with template test

Merge branch 'remove-settings' into development

Merge branch 'fix-template-controller' into development

updated plan edit lock warning message and disabled textbox with user's answer DMPRoadmap/roadmap#55

updated generic error message handler to show value when applicable DMPRoadmap/roadmap#234

removed confirmations controller, route and tests since we turned devise's email confirmation off DMPRoadmap/roadmap#254

removed test for the user plan_list settings ...

DMPRoadmap/roadmap#248

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

created migration from suggested_answers and question.guidance according to #223

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

updated link to admin area to ensure that the user has permission to view that page, fixes #265

Removed extraneous .all