updated users controller

updated users_controller, mainly renaming roles to perms

updated code style in omniauth_shibboleth_request_controller

renamed comments to notes

code style change in sessions_controller

added comments to home_controller, awaiting discussion

updated contacts_controller

removed organisation_users controller as duplicate from users controller

updated some of the answers structure, commented for future updates

finished update of token_permission_types_controller

updates so that a user can log into the site \n updated application_controller, user model, registrations edit view, and layouts branding

replaces Organisation. with Org. in all files

removed option_warnings table and unused code surrounding the structure

fixed bug where selecting guidance was impropperly filtering

Merge branch 'master' into postgresql

removed commented out code from new branding changes

renamed layout partials to remove reference to dmponline. Updated configurations so that the code default assets are stored in lib/assets and any instance specific versions would be stored within app/assets. Move static page content out of the large locales files and placed examples of them into config/locales/static_pages

removed ability to customize view branding folder name. It will just be called branded now

moved assets from app/assets to lib/assets. The files in lib/assets will be used by Rails unless override by an equivalent file in app/assets. Added logic to applicationController so that it will look first for a template in app/views/[:branded folder name] before using the default in app/views

Bug fix to the column layout handler on the view plans page

fixed issue with settings data saved to the DB using an old version of the gem. stripped html tags from question text for display in the export form.

allowed organisations to save their details without submitting a contact email

updated application controller so that a user is redirected to the main landing page when then try to access a secure page when not logged in. Added the corresponding locale messages that will be displayed when this happens

updated passwords controller to redirect user to the main landing page after initiating a password reset. Removed reference to invalid spinner css from main layout file

updated gitignore to include initializers that should be server specfic. removed reference to missing spinner.css

resolving merge conflicts

modifying relationship between users and organisations \n -users now belong_to organisation \n -organisations now have_many users \n -removed the depricated user_org_roles structure with migration \n -moved data out of that structure into the existing organisation_id field of users to complete relationship \n -re-evaluated functions to do with organisation_id field, as it was used as a placeholder before

Fixed issues with modal dialog functionality when trying to edit a published template

fixed authorization variable issue in dmptemplates_controller#admin_cloneversion

Merge branch 'master' of https://github.com/DMPRoadmap/roadmap into postgresql