updated export views to impliment the logic from the new downloads page #498

fixed merge conflicts in db/schema.rb

updated preferences to use JSON hash and be contained in a new model, addresses #481

finished up project details page

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

fixed broken test created by change in dashboard page title. updated logo resize function on org model to work with larger image size DMPRoadmap/roadmap#242

added question_options to answer's deep copy method and added a unit test for it. Updated several views to use .length instead of .count

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

fixed merge conflicts

only published guidance groups display for plan details

include the additional preferences on user profile

Merge branch 'public-plans' into CDL-MVP

added check for nil owner

fix the nil error for notification preferences

switched default prefs setting to before_validation

fixed merge conflicts

Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP

fixed merge conflicts

fixing the tab issue on Edit profile page;add/update notification preferences

Merge pull request #423 from DigitalCurationCentre/xsrust/bugfixes ...

Xsrust/bugfixes

updated other controller actions shown to throw error by test, we render phases/admin show from other controllers, so need same instance variables defined

Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP

Change default plan visibility to `3` (`:privately_visible`)

fixes error with prefetching, now passes tests

added plan visibility to edit/view plan details DMPRoadmap/roadmap#151

api updates

Add Notification Preferences to User's profile page

resolved cherry-pick conflicts

fix issue regarding co-owner ablility to delete the plan #242 ...

(cherry picked from commit 6b90953)