added nil check to user model's keep token method

Fixed typos: changed all change_org_detials to change_org_details

Updated association between User and Organisation to reflect the removed user_org_roles table. Each User now belongs_to an Organisation.

reverted back changes to user<-->org relationship. added missing api and magic strings sections to the other locale files.

Revert "Fix to bug in user model that was preventing the organisation association from working (#30)" ...

This reverts commit 03941c1.

Fix to bug in user model that was preventing the organisation association from working (#30) ...

* updated dragonfly max logo height/width to 160px to fit with current max size of DMPRoadmap logo

* updated organisation edit page's error messages so that errors are placed in the alert text section. Updated wording in locale files to reflect the 160x160 file size.

* removed height and width constraints to logo upload function. Added method that will resize the uploaded logo so that the width is 160px (maintaining aspect ratio) so that the logo fits within the layout properly

* changed logo size to a height of 100 and moved logo so that it appears alongside the DMPRoadmap logo per the current specifications

* Removed description field from organisation. Add contact email to the organisation. Change the way the logo is displayed on the organisation screen.

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

* Commented out other deprecated user<-->organisation methods so that they use the user.organisation_id field instead of the user.organisations structure. This needs to be cleaned up and overhauled in the user and organisation models so that user belongs to an organisation and organisations have many users, and any references to the old code need to be updated.

Commented out deprecated user.organisation_id method (#29) ...

* updated dragonfly max logo height/width to 160px to fit with current max size of DMPRoadmap logo

* updated organisation edit page's error messages so that errors are placed in the alert text section. Updated wording in locale files to reflect the 160x160 file size.

* removed height and width constraints to logo upload function. Added method that will resize the uploaded logo so that the width is 160px (maintaining aspect ratio) so that the logo fits within the layout properly

* changed logo size to a height of 100 and moved logo so that it appears alongside the DMPRoadmap logo per the current specifications

* Removed description field from organisation. Add contact email to the organisation. Change the way the logo is displayed on the organisation screen.

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

updated efficiency of update_user_permissions

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

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