commented out old styling to make it easier to determine whether boostrap or old css is controlling layout/styling DMPRoadmap/roadmap#573

refactored scss to include easily brandable overrides to the sites generic styling. also added a new file to override boostrap and added a section at bottom of dmproadmap variable file for new variables DMPRoadmap/roadmap#573

switched every page to use bootstrap's row/col grid system DMPRoadmap/roadmap#552

pulled bootstrap in and updated basic header/footer/main content to use the grid system. Updated static pages, home page and contact us page to use grid system DMPRoadmap/roadmap#552

front-end dependencies handled through npm. DMPRoadmap/roadmap#551

moved orcid and remove images to lib

Merge branch 'master' into add-orcid-functionality

added additional locale message for identifier schemes and a remove icon

resolved rebase merge conflicts

tidied up new tests and fixtures. Commented out old tests that were failing. Updated relationship between TokenPermissionType and Organisation so that token_permission_type.organisations works

merge postgresql -> master

fixed display bug on plan creation confirmation pop up

Added a new identifier_schemes table and corresponding user_identifiers join table. Added the initial ORCID identifier scheme to the seeds.db file. Updated the locales file to include corresponding identifier tooltip language, logos, and initial connection message. Updated user profile page to dynamically display identifiers

fixed issue with 'make small changes' selection on template version edit modal

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

Fixed issue with plan creation not properly saving guidance selections. Fixed contact us page typos

Fixed JS issues with select2 boxes not properly updating contents when 'not applicable' clicked and not updating the funder/institution on the confirm dialog

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

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

fixed position and look of organisation dropdown in Sign Up form

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

removed debug lines and added comments

finished up removal of ajax calls from create plan page

updated json for guidance_groups so that the organisation id is included for filtering purposes

Removed ajax calls in create project/plan page. It now passes all of the options to the UI and lets the UI filter them as needed. Also upgraded the select2.js script to the lates 4.x version

Merged branding changes from the development branch into the master branch that now contains DCC's changes to permissions/roles, internationalization and bug fixes

merged DCC changes into master

fix various issues to do with display of formatting in questions

Branding changes (#24) ...

- Removed the description field from organisation
- Added a contact email field to organization
- Added an email address validator
- Updated organisation logo upload so that the system will resize the image to the correct height rather than forcing the user to provide a 100x100 image
- Change how the organisation logo is displayed 

* 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.

explicit bullet style for questions and raw questoin test in form