Merge branch 'CDL-MVP' into CDL-MVP

FormHelpers for registrations views. DMPRoadmap/roadmap#483 ...

FormHelpers for plan views. DMPRoadmap/roadmap#483

FormHelpers for shared views. DMPRoadmap/roadmap#483

fixed typo at views/plans/_available_templates.html.erb. DMPRoadmap/roadmap#483

Merge branch 'CDL-MVP' into CDL-MVP

switch flash[:notice] to flash[:alert]

made adjustments to success message logic

Change flash notice to alert for error

Adds copy template option #148

fixed tests DMPRoadmap/roadmap#175

updated controllers to use alert instead of notice for errors DMPRoadmap/roadmap#175

updated tests to work with new standardized success messages DMPRoadmap/roadmap#175

added generic success message and updated controllers to use it DMPRoadmap/roadmap#175

fixed typo

reverted permission changes so that a user cannot grant permissions that they themselves do not have

fixed bu in plans.controller, added new fields to attr_accessible on plan model, added migration tasks for v0.4 upgrade

fixed bug in omniauth controllers and added test

load the selected user profile tab after page reload

add the selected tab name to form

prevent omniauth id being attached to multiple user records

updated plan edit save so that it doesn't throw an error about visibility

remove prefs from registrations controller, as its refered in users

fixed merge conflict

fixed issues with plan edit/share/export and updated to work with new css. tweaks to layout of create plan

fix update_password form

switched guidance update to return to edit page instead of show

fixed merge conflicts

Fixed test broken by new CSS changes and the removal of a few unessecarry show (e.g. org, guidance, etc.) pages

Merge pull request #469 from DigitalCurationCentre/issue459 ...

added remove_logo as permitted parameter.

fix merge conflicts

saving password details separately

added remove_logo as permitted parameter. DMPRoadmap/roadmap#459