commented out legacy user.organisation_id method in user model. Each user now belongs to one organisation

Merge pull request #8 from DMPRoadmap/master ...

bug fix and gemfile.lock rebuild

Fixed bug in logo branding view

fixed merge conflicts

Merged branding changes from the development branch into the master branch that now contains DCC's changes to permissions/roles, internationalization and bug fixes

merged DCC changes into master

updated efficiency of update_user_permissions

more merge conflicts

added ability to grant permissions to other users

fixed a bug where users' api_tokens would display if they had none

overhaul of performance of users admin-index

added new permissions to api

added docs to new function

finished changes to update_user_permissions

made changed to user.rb

made changes to update user permissions

added debug to update_user_permissions

turns out we do user user_org_roles to determine organisation, re-added

fixed bug in can_<do permission>? functions

updated the organisation_id = (new) in user model, was causing seed to fail

updated funciton to ensure no dupelicates

added functionality to port users from old auth structure to new

ensured users loose roles upon org changing and added depricated tags to roles

updated documentation syntax for some models

removed cancancan and rollify

added granting api to orgs permission

implimenting auth changes in the views

fixed merge conflicts

added ability to grant permissions to other users

fixed a bug where users' api_tokens would display if they had none