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

removed the public dmps link from the main nav. we will reintroduce at a later date DMPRoadmap/roadmap#167

Export plans according to gettext. DMPRoadmap/roadmap#98

fixes DMPRoadmap/roadmap#172

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

fix access to owner and template

Merge branch 'issue167' into development

Extended .pot an .po files with translations from static.yml. DMPRoadmap/roadmap#167

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

termsuse view according to gettext. DMPRoadmap/roadmap#167

roadmap view according to gettext. DMPRoadmap/roadmap#167

help view according to gettext. DMPRoadmap/roadmap#167

about_us view according to gettext. DMPRoadmap/roadmap#167

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

Replace parametrised .yaml keys (e.g. t("helpers.settings.plans.margins.#{pos}")). DMPRoadmap/roadmap#98

I18n replaced from models. DMPRoadmap/roadmap#98

I18n replaced from controllers. DMPRoadmap/roadmap#98

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

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

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

minor fixes from code review

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

timestamp off updated_at rather than created_at plus other tidying up