added gemfile and broken branding file

updated the migration to set the customizing organisation properly

fixed template versioning and customisers in migration

updated data migration to not over-write organisation_id for templates with nil

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

additionally stores old project_id for new_plans

changed the way answers are selected in migration

updated prefetching, relocated index definition, and removed debug for migration

wrapped migration in transaction for performance

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

removed early cutting for template project and relpaced with better selection

updated to allow template versioning to function correctly

total schema data migration: now with customized templates

preliminary migration of db schema - migration subject to change

renamed roles to perms

updated models for data migration

removed commented out code from admin/question.rb

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

Merge branch 'text_changes' into postgresql

text changes requested by Sarah 2016/11/14

Merge branch 'add_spanish' into postgresql