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

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

URLs without locale param

removed old Ability model which was used by the CanCan gem. added some more test coverage for Org and User

removed User.org_type method and updated calls to in on some template views to use the new org.funder? instead

filled in test coverage gaps. Removed duplicate User.can_grant_api_to_orgs? method

commented out organisation getter/setter in user. switched calls to org

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

added a few attributes to Plan and User attr_accessible sections