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 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

text changes requested by Sarah 2016/11/14

if no title for news tab miss it out

Merge branch 'postgresql' of https://github.com/DigitalCurationCentre/roadmap into postgresql

fix save profile

fixed bug where selecting guidance was impropperly filtering

Merge branch 'master' into postgresql

removed commented out code from new branding changes

removed commented out code from new branding changes

removed local version of app/assets/logo from version control

renamed layout partials to remove reference to dmponline. Updated configurations so that the code default assets are stored in lib/assets and any instance specific versions would be stored within app/assets. Move static page content out of the large locales files and placed examples of them into config/locales/static_pages