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

ran bundle update to rebuild Gemfile.lock

updated 'i accept the terms and conditions' link on sign up form so that the terms open in a separate window

increased width of nav bar so that 'change language' and german/french versions stop wrapping

Fixed bug in yaml files. Updated help page content so that it lists an MIT license

updated links and email addresses on the static forms

Changed Digital Curation 'Center' to 'Centre' in all locale files

Added fix for issues when displaying column headings on the view plans page. Setup and 'Unknown' column heading that defaults to ' - ' but is updateable in the locale files. If there are issues determining the column heading it will use that value

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

rebase with DCC changes

Merge pull request #32 from DigitalCurationCentre/master ...

Merge DCC work into shared Roadmap

fixed issue where orgs cannot customise other org's(funders) templates. logic for this auth limiting dosent make me happy as it potentially allows organisations to submit edited json via post and change the other organisations existing sections, even if that option is not available through the ui

fixed bug where projects_controller wouldnt compile. there was an end in the middle of the file, terminiateing the class prematurely

Merge branch 'fix_ul_html'