removed organisation_types and replaced with bitflags

Added magic strings and identifier schemes to new ES locale file. Updated names of magic string categories so that they match the table names

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

changed has_one to belongs_to in new_plans -> templates relationship

updated roles to perms as per renamed table

added new_plans relation to users through roles

added users to new_plan relationships

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

Resolved merge conflicts with fr.yml locale file and the user.rb model. Kept 'language_id' in the attr_accessible list and kept both the self.from_omniauth and reset_password_link methods.

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

fixes from feedback from french testing of dmponline

bugs found in fr dmponline

updated models for data migration

add a reset_password_link method for convenience

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