Added Feedback Request to Org Details ...

Initial form changes for the New Org Details

added new db components for the org profile tab

split org page into tabs and updated profile form

switched section headers from labels to h3

finished org details tab

added feedback tab

made textarea a tinymce

fixed test broken by org controller update

Added btree back to schema.rb

added foreign keys back to schema.rb

fixed default email for feedback

if no defaults specified, obtuse error. now improved.

fixed merge conflicts from pulling in latest bug fixes from development

updated plan sharing to be case-insensitive

Merge branch 'development' into CDL-MVP ...

Backporting bugfixes. db:migrate needs to be run to add new indices.

added ability for users to remove themselves from plans, without destroying the plan

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

removes plans from default scope of users (this was causing 2 extra queries run per page) and not always used

include the additional preferences on user profile

fix the nil error for notification preferences

switched default prefs setting to before_validation

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

Add Notification Preferences to User's profile page

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

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

removed comments from user model, fixes #314

Merge branch 'remove-settings' into development

Removed remaining pieces of the plan_list settings DMPRoadmap/roadmap#248

removed the devise confirmation requirement DMPRoadmap/roadmap#254

removed validate on User.password/email from user model because it conflicts with Devise's validation rules

added a test that searches for missing translations. Added specific error messages for model validations. Added some devise controlled error messages to pot/po files DMPRoadmap/roadmap#236

resolved rebase conflicts from merge with development

switched all Perm::CONSTANT to Perm.scope calls. Travis could not handle CONSTANT definitions likely due to rails/ruby evironment. Its better to use scope for queries anyway

testing switch from constant to scope on perm

added debug to User perm check

Administrate (new Super Admin) fixes ...

- Bumped version to latest for upstream bugfixes, fixes DMPRoadmap/roadmap#196
- Removed unneeded fields from some dashboards (that slowed down their Edit page)

Fixed merge conflicts

added plans to prefetching for users

set user's default scope to prefetch organisation and permissions

added constants for all perms in model