removed some old empty test files. removed facebook example from identifier_schemes seed

fixed merge conflicts in schema.rb and test_helper.rb

finalized helper tests. additional tweaks to Plan tests

added settings::plan test

updted some stale references to Project and Dmptemplate. built more unit tests for Plan methods. Commented out a lot of methods that appear to be unused

added check to migration to see if new_plan table exists prior to attempt to create a new NewPlan model

removed NewPlan, AdminUser models. Updated API base controller to check auth via token type and org

removed old Ability model which was used by the CanCan gem. added some more test coverage for Org and User

filled in test coverage gaps. Removed duplicate User.can_grant_api_to_orgs? method

some cleanup of irrelevant objects (e.g. removal of remaining OrganisationType)

removed references to organisation_id in several models and replaced with .org.id

added some missing unit tests. fixed typo on Template.has_customisations? method

renamed projects_helper to plans_helper. moved template.settings tests to settings:template_test

Updated projects_helper by renaming 'project_list_column_body' to 'plan_list_column_body'. updated references to that code block. moved hard-coded 'Unknown' to locale files. Added tests for projects_helper

corrected test for title check of the 'my plans' page

added answers_controller tests

fixed issue with static_pages_controller_test

updated test_helper to use model_name.human.pluralize.titleize instead of calling out to I18n

fixed issues with application_controller tests

started correcting issues with function tests for application_controller

fixed issue with routes test

switched references to Project to Plan in routes test

fixed User.name test due to new param added to method

updated generic deep copy test to check for uniqueness of excluded attributes (e.g. id, slug, dates, etc.). Fixed typo in Question.deep_copy. Added calls to deep_copy test for template, phase and section

removed old references to the Amoeba gem which was used to clone models. Fixed typo in Question.deep_copy. Added generic test for deep_copy methods.

fixed a few merge conflicts

added theme unit tests and started cleanup of remaining existing tests

added suggested_answer unit tests and started on template unit tests

added check to role that sets access by default. added unit tests for section

removed 'self.save' from the Role access_level getter and setter. Shouldn't force a save there (especially in a getter). Verified that controller calls update/save after changing the value