Merge branch 'feature/superadmin' into HEAD ...

Replaces ActiveAdmin with Administrate.

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

choose template where org has more than one valid

resolve conflicts from merging Roadmap into DCC

still need @languages when updating email address

removed debug statement from projects controller

fixed issues with omniauth and registrations controller tests. removed some debug statements

Export plans according to gettext. DMPRoadmap/roadmap#98

fixes DMPRoadmap/roadmap#172

fix merge conflicts

change from serialized hash tp just using includes

Commented out public_export action since it is working. Currently redirect to public_plans prompting a message. DMPRoadmap/roadmap#167

public_plans view according to gettext. DMPRoadmap/roadmap#167

Language switcher hidden if only one language is installed. DMPRoadmap/roadmap#110

- Fixed app/controllers/admin/application_controller.rb oopsie ...

- Upgraded Administrate to 0.4.0 release

switched registrations controller to user org_id instead of organisation_id. fixes DMPRoadmap/roadmap#145

Installed Administrate as Super Admin backend

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

switched to using the hash for data access for admin_template view and associated partials

Removed ActiveAdmin

Replaced I18n.t(...) from controllers. DMPRoadmap/roadmap#98

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

remove unneeded format constants

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

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

completed fixes for guidances and guidance_groups controllers