final tweks to ensure all migrations happen together

replaced plan roles with bitflags

removed organisation_types and replaced with bitflags

updates so that a user can log into the site \n updated application_controller, user model, registrations edit view, and layouts branding

removed version and updated users_roles to users_perms

made necissary changes to allow the app to display the splash/login screen

replaces Organisation. with Org. in all files

updated theme and user models's associations

updated models for role, section, and suggested answer

updated question_format and roles models

updated relations in question model

began changing models to reflect the new model names and relationships, additionally deleting some old/unused models which no longer apply in the new schema.

removed unused models

added migration to add foreign keys. Also needed to remove the temporary models, and update existing models to reflect the new relationships

updated code to write user-generated content (answers/notes)

updated models for data migration

removed the unused user_id field from the dmptemplates table

removed models and super admin pages for removed tables user_role_type, user_status, and user_type

removed domain and stylesheet_id from organisation. Both were unused on the front and back ends of the tool

removed role_in_plans, resource_id, and resource_type from the roles table. All were unused

removed parent_id field from questions table

removed option_warnings table and unused code surrounding the structure

removed user_statuses, user_types, and user_role_types tables and associations which referenced them

profile save crashing

Merge branch 'master' into postgresql

fixed bug where templates were not based on most recent version, causing organizational customizations of templates to not show up to the end user

Corrected spelling of text_desription field in token_permission_types

fixed issue with settings data saved to the DB using an old version of the gem. stripped html tags from question text for display in the export form.

tidied up new tests and fixtures. Commented out old tests that were failing. Updated relationship between TokenPermissionType and Organisation so that token_permission_type.organisations works

commented out guidance and guidance_group tests