fixed rebase issues

removed template->question dropdowns on guidance pages. updated controller and JS accordingly. fixed issue with themes not being saved. DMPRoadmap/roadmap#221

resolved rebase conflicts from merge with development

cleaned up guidances controller and added functional tests

switched all Perm::CONSTANT to Perm.scope calls. Travis could not handle CONSTANT definitions likely due to rails/ruby evironment. Its better to use scope for queries anyway

testing switch from constant to scope on perm

added debug to User perm check

Added freeze back to perm constants. did not turn out to be the issue with travis tests

removed 'freeze from Perm constant definitions. this is deprecated in Rails 4

Merge pull request #206 from DigitalCurationCentre/development ...

Super admin fixes/improvements

Administrate (new Super Admin) fixes ...

- Bumped version to latest for upstream bugfixes, fixes DMPRoadmap/roadmap#196
- Removed unneeded fields from some dashboards (that slowed down their Edit page)

fixed some of the failing tests. Commented out helpers/plan_list tests because it relied on old I18n helpers to determine column name

fix access to owner and template

fix merge conflicts

change from serialized hash tp just using includes

public_plans view according to gettext. DMPRoadmap/roadmap#167

I18n replaced from models. DMPRoadmap/roadmap#98

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

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

minor fixes from code review

timestamp off updated_at rather than created_at plus other tidying up

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