updated attr_accessible lines to allow mass assignment of associations via object instead of id

finsihed phase unit tests. added all unit tests that i forgot to add in prior commits

added unit test for phases and updated readme with links out to wiki docs

added organisationtype unit test and finished organisation unit tests

added unit tests for options and option_warnings

moving commit from wrong branch to dev

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

finished guidance_groups test. started on guidance tests

put validation back in place that ensures a question can only have a single answer within a plan

replacing accidentally deleted contact_us gem reference

removed substance-forms from gemfile

removed substance-forms modifications from the dev branch. will place in a separate branch so that we can continue development

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 merge conflict in seeds.rb file. installed substance-rails gem and updated code to swap in the substance-forms text-area for tinymce on the answer section of the edit plans page

Switched answer text area to substance editor.

Added substance-rails gem and then included the appropriate js and css libraries into the asset pipeline

fixed template versioning and customisers in migration