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

updated statistics api endpoint to be in line with the new data model

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.

added guidances endpoints for api, updated typo in guidance_groups_api_controller

init of api template_policy

brought templates controller for api in line with new data access/auth

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 typos introduced at interpolated strings. DMPRoadmap/roadmap#98

templates views according to gettext. DMPRoadmap/roadmap#98

suggested_answers views according to gettext. DMPRoadmap/roadmap#98

sections views according to gettext. DMPRoadmap/roadmap#98

questions according to gettext. DMPRoadmap/roadmap#98

question_options views according to gettext. DMPRoadmap/roadmap#98

phases views according to gettext. DMPRoadmap/roadmap#98

guidances views according to gettext. DMPRoadmap/roadmap#98

Fixed merge conflicts

fixed typo. DMPRoadmap/roadmap#98

templates views according to gettext (half-way through). DMPRoadmap/roadmap#98

users views according to gettext. DMPRoadmap/roadmap#98

user_mailer views according to gettext. DMPRoadmap/roadmap#98

settings views according to gettext. DMPRoadmap/roadmap#98

projects views according to gettext. DMPRoadmap/roadmap#98

plans views according to gettext. DMPRoadmap/roadmap#98

Moved Actions, views, and partials for sections/phases/questions/suggested_answers out of templates, and wrote up associated authorization

phases views according to gettext. DMPRoadmap/roadmap#98

orgs views according to gettext. DMPRoadmap/roadmap#98