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

finished fixes for answer creation race condition DMPRoadmap/roadmap#241

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

Updated test so that it does not provide a version or org so that we match what the form is doing DMPRoadmap/roadmap#191

removed test that checks fastgettext locale value after sign_in. Having trouble testing Fastgettext in the application_controller test as well.

finished functional tests DMPRoadmap/roadmap/#212

further bug fix for show_export page and controller test for this endpoint

broken generic error message handler apart into separate create/update/destroy versions. updated calls within the controllers and fixed tests DMPRoadmap/roadmap#227

fixed issues in tests after merge and added tests for plans controller

added initial plans controller tests

added roles controller tests and updated controller to use strong params and handle failures properly

patched organisation_type reference in view, added secure params to orgs controller. Added functional tests for orgs controller

added checks to make sure records are actually created/updated/deleted

added notes controller tests

added home controller test. updated test helper to reload LANGUAGES constant if its blank during TravisCI build