changed schema to be correct for point of migration of data

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

removed trailing ] from plans_controller

removed tooltip for now defunct description field from the organisation page

fixed typo in invalid web address notification

replaced invalid SQL conditionals "&&" with "AND"

Updated 'destroy' label on view plans page to read 'delete'

Changed 'plan title' to 'file name' in export settings to more accurately reflect what the information will be used for.

fixed issue with policy check when saving changes to a plans export settings

Updated export page so that the settings section of each phase's accorordion panel is not an accordion. Its now just a div.

updated actionmailer to use the hostname when adding urls to emails. Also fixed bug in [object]_path route helpers contained within an ActionMailer view. ActionMailer was not proviing the localization portion of the url. Manually including the default locale now in links to the project

fixed issue with plan list column display issue

fixed issue with branding variable resolution on plan modal dialogs

Fixed typos: changed all change_org_detials to change_org_details

removed all instances of comparing booleans to 1 or 0 for postgres compatability

removed boolean limit as postgres has proper boolean support

Update Gemfile ...

changes for pg migration

removed references to old existinguser controller that was used to handle logins from old DMPOnline v3 accounts

added errors to organisation controller flash notice

fixed bad route reference in organisations controller

Added trap for Dragonfly exceptions on the organisation update. It will now display the logo upload error message stored in the locale files

Fixed duplicate table issue in edit organisation details page cause by an old merge conflict resolution

fixed organisation policy file to use user.organisation instead or user.organisation_id and fixed typos

fixed policy name typo in locale files

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

Updated css so that admin/profile popup menu links fit regardless of language selection. Updated profile save so that if user changed the language selection it updates the current user's locale

Moved language load from registrations/edit page into the controller. Updated registrations/edit page code to directly create the <select> box rather than using rails helpers which for some reason would not actually select the current language value

Updated controller so that user is kept on the edit profile page after saving their changes

added json response back to the settings/projects controller. This just returns the list of selected and available columns for the user's preferences

fixed position and look of organisation dropdown in Sign Up form