more merge conflicts

overhaul of performance of users admin-index

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

overhaul of performance of users admin-index

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