fixed merge conflicts

Fixed failing functional & translation tests

Merge local branch into feature/sso - fixes #39, #276, #287, #290. ...

Unified omniauth cases & updated tests.
Deleted Project Controller & tests (no longer needed).
Please db:migrate after this commit.

Updated styling of new jquery accessible dropdown and added fontawesome DMPRoadmap/roadmap#124

fixed some initial errors with tests after last PR

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

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

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

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

updated wording of template publication statuses DMPRRoadmap/roadmap#251

fixed pages so that they work with new controller logic DMPRoadmap/roadmap#251

updated tests to work with new template logic DMPRoadmap/roadmap#251

Updated tests to work with updated controller

finished integration tests for template versioning. added helper method tests to template unit tests

trying to add default scoping for template

added initial integration tests for template versioning logic

added dmptemplate_id to the Template creations in db seeds file and test_helper

Added tests for new guidance methods on Plan model

updated tests on plans_controller

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