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)

fixed typo introduced during merge conflict resolution

resolved merge conflicts from merging development 2016-06-09 into CDL-MVP

updated admin_index for templates to not bug for some orgs, reimplimented logic for transfering customizations, changed text according to #338

Merge pull request #404 from DigitalCurationCentre/issue337 ...

Fixed problem when creating a question. Fixed JS to display/hide defa…

Fixed problem when creating a question. Fixed JS to display/hide default answer. Fixed tinymce problem for example answer. DMPRoadmap/roadmap#337 ...

fixed create_a_new_question test. DMPRoadmap/roadmap#337

Default ordering for Phase, Question becomes .number - closes #402

Made invitation email title same as sharing email title - related to #271

Updated translation strings & added :migrated attribute access to template model

Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into vyruss/bugfixes

Re-enable attr_accessible for Dragonfly gem (logo uploads) - closes #375

Added method to validate answer according to each question format. Partial view for section progress. Eager loading of resources needed to calculate plan and section progress. Refactoring of code for progress plan. DMPRoadmap/roadmap#382 ...

Fixed merge conflict. DMPRoadmap/roadmap#382

onChange event for tinymce at plan answers. Removed unnecessary options passed to tinymce. DMPRoadmap/roadmap#382

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

fixed display issues with guidance/suggested_answers

fixed display issues with guidance/suggested_answers

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

updated org-admin and plan create pages to reflect schema change

Permission yanking should not apply to super admin. #314, #367

Export TXT excluding section heading if no questions are selected. DMPRoadmap/roadmap#295