resolved rebase conflicts from merge with development

added tests for guidance_group controller and added method to test helper to get org admin DMPRoadmap/roadmap#212

fixes issue with publishing guidance groups DMPRoadmap/roadmap#185

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

removed references to organisation_id in several models and replaced with .org.id

controllers only respond to html

guidance and guidance groups controller changes

re-wrote data access for guidance_groups controller

removed json and forced authentication on guidance_groups

updated authorization for all controllers ...

-changed from passing through records as feature not supported
-changed 403 error to better reflect what's happening
-added scope to many of the indexes
-added organisation-scope to requests from old org-admin roles
-renamed guidance_groups_policy to guidance_group_policy.rb

added pundit auth to guidance groups

DMPonline4 - RAILS 4.0 (#4) ...

Merging the initial DMPOnline4 codebase into Roadmap

DMPonline4, this code was designed and implemented by the Digital
Curation Centre (DCC)
DMPonline runs in Ruby 2.1 and Rails 4.0, there is a mysql database.