created a to_hash method for templates to help remove data access from views

reinstate funder_id used in create plan

change question_format to use enum rather than bits

merge optimistic locking into dev

Optimistic Locking ...

- add bit field to question_format so we don't have to test strings to determine format

- add isOptionBased to question so we dn't have to do multiple string comps for this - there was a boolean already in the DB not being used

- add migration to add bit field

- add migration to add lock_version field to answer

- change answers_controller to do optimistic locking

- change answers controller not to redirect to plans/phase/edit as it wasn't doing anything

- introduced answers/update.js.erb to handle the return from /answers/update.

- to do the conflict resolution you need the old answer and new answer objects. Tried using clone but it doesn't work because it only does a shallow copy. So adopted a "nuclear-option" deep copy but it's a bit much. A compromise would be better.

completed fixes for guidances and guidance_groups controllers

updated all_viewable method of guidances to return an array of guidance

updated gudiance api \n - brough auth in line with the rest of site using pundit \n - updated displayed information in line with model changes\n - removed multiple guidance groups and removed templates/guidance groups

updated guidance and and perm. added constants to token_permission_types

Fixed merge conflicts

Merge branch 'final_schema' into development ...

Fixes DMPRoadmap/roadmap#103 wree done in local final_schema
branch befoe development was created from final_schema
so this merge final_schema into development.

Chnage progress bar to reduce num queries. Fixes DMPRoadmap/roadmap#103

added plans to prefetching for users

set user's default scope to prefetch organisation and permissions

added constants for all perms in model

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

URLs without locale param

sort out post merge issues

fix up post merge errors

mege in head changes

trying to reduce data access queries. Needs more work

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

removed slugs unique requirement from phases ** may break other code

finalized helper tests. additional tweaks to Plan tests

Merge pull request #30 from DigitalCurationCentre/final_schema ...

updated migrations to comply with validations, added guidance-guidanc…

re-wrote guidance_for_org fuction to hit the db less

updated migrations to comply with validations, added guidance-guidance_groups many to many relationship back in for migration

updted some stale references to Project and Dmptemplate. built more unit tests for Plan methods. Commented out a lot of methods that appear to be unused

removed NewPlan, AdminUser models. Updated API base controller to check auth via token type and org

removed org_token_permission and users_perm models. They are declared via a has_and_belongs_to_many relationship which designates the underlying table so there is no need for a model. Removed old organisation_type which has been replaced