made toolbar a generic table filter. finished css restyling of users page

fixed merge conflicts

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

Merge branch 'CDL-MVP' into branding

rebranding

move user profile to partials, and add prefrences tab

Add Notification Preferences to User's profile page

Added dotted underline (HTML5 recommendation) for org admin user privileges - #259.

Added tooltips & strings for org admin/user permissions, closes #259

users views according to gettext. DMPRoadmap/roadmap#98

updated users controller

Update users page logic so that current user cannot edit their own permissions

Fixes to the users page

merged DCC changes into master

fixed merge conflicts

added ability to grant permissions to other users

overhaul of performance of users admin-index

implimenting auth changes in the views

implimenting auth changes in the views

Merging current stable development branch into master (#23) ...

This is our unofficial v.0.1.0 release. It includes:
- Rails 4.2 migration
- Internationalization
- API
- Institutional logo upload (thanks to Weiwei and the Univ. of Alberta)
- Generic branding
- General cleanup of code and bug fixes

added fucntionality to give org_admin priveleges through the org_admin interface

fiexed a bug where user's api token permissions wouldnt display

updated org-admin view of users for rails 4.2 compatability

added forgotten view for org-admins giving user's api permissions

pointed form to the new controller action

moved old org-admin users index view to new controller, added logic for updating api privleges