fixed merge conflicts

Merge branch 'DigitalCurationCentre-removing_unused_tables' into removing_unused_tables

fixed merge conflicts in branding.yml and schema.rb

Merge pull request #17 from DigitalCurationCentre/postgresql ...

pulling in DCC stack

updated api templates endpoints to use new data access

updated additional parts of the admin_phase view to use the new schema's data access. Additionally changed models for suggested_answer, user, guidance_group and question to better reflect the associations in the schema

updated admin_phase view and partials associated with it to use new data access

sections belong to phases, not versions

updated phase so that it dosent delete a template when destroyed

updated admin_addphase in templates controller

updated admin_destroy for templates

updated admin_create in templates controller

updated admin_new to reflect new schema, converted tabs to spaces

templates admin_update working

updated admin_template action and views, also removed spaces from affected files

updated accessing of own templates to only display most current versions

added gemfile and broken branding file

changed schema to be correct for data migration

updated the migration to set the customizing organisation properly

patch so that templates_controller index displays

updated schema to reflect final set of migrations after going through process from scratch

fixed template versioning and customisers in migration

updated foreign keys null refreence ripper to remove things from a join table

changed Org.organisation_type to Org.type to fix conflict in running migration

re-aranged migrations so that big_flags for orgs happen before foreign keys

re-aranged migraitons so that bit_flags for roles happens before foreign keys

added role scrubbing to foreign keys migration

hacked templates landing page to work

renamed dmptemplates to templates

pulled data access out of devise/registrations/edit