Updated routes to check for the existence of the new identifier_schemes table because rake db:migrate initializes the Rails app and devise tries to make use of the new table

Merge branch 'master' into add-orcid-functionality

removed commented out code from new branding changes

removed commented out code from new branding changes

removed local version of app/assets/logo from version control

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

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

attempting to silence the activerecord log during tests.

attempting to silence the activerecord log during tests.

removed mysql dependency from travis file and updated database_example.yml so that it uses sqlite instead of mysql for testing