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

Added tests for the new omniauth functionality

fixed typo in fr.yml locale

Removed logo from identifier_schemes db table and added it to yaml locales. Added more entries for to the locales for oauth. Added red 'x' removal link for oauths on profile page. updated registrations controller so that users hitting the oauth handler that are not already signed in are brought to a registration page with a new user record that is connected to the oauth identifier

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

Pull latest DMPRoadmap changes

Merge pull request #62 from CDLUC3/master ...

Bug fixes for export functionality, initial unit testing, etc.

removed <p> wrapping from default answers in preview

updated behavior of the create plan page

allowed default answers to show in admin preview of templates

Merge branch 'master' into add-orcid-functionality

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

added additional locale message for identifier schemes and a remove icon

reverted travis file back to db:migrate

remove db:test:prepare and replaced with specific drop, create and migrate

remove db:test:prepare and replaced with specific drop, create and migrate

switch travis to use db:test:prepare instead of db:migrate

switch travis to use db:test:prepare instead of db:migrate

fixed path error in travis file

fixed path error in travis file

Fixed name of wicked_pdf initializer example and removed devise.rb initializer

fixed bug where templates were not based on most recent version, causing organizational customizations of templates to not show up to the end user

fixed typo in devise.rb.example

Added check to devise initializer so that it does not try to access the IdentifierSchemes table before it has been created (happens when running db:migrate)

Added check to devise initializer so that it does not try to access the IdentifierSchemes table before it has been created (happens when running db:migrate)

Merge branch 'add-orcid-functionality' of https://github.com/CDLUC3/roadmap into add-orcid-functionality

resolved rebase merge conflicts

Corrected spelling of text_desription field in token_permission_types

Updated locale files with proper labels for the plan export screen

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.