added JS logic to prevent is_test and is_public from both being true on the project edit page. Also added include to projects show page so that it pulls in the projects.js file

Merge pull request #16 from DMPRoadmap/development ...

Development

fixed typo in fr.yml locale file that was introduced while resolving merge conflicts

added a initialization helper to assist with omniauth provider registration. Added a remove.png image for disconnecting providers from user accounts

Merge branch 'master' into add-orcid-functionality

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

DMPonline4 - RAILS 4.0 (#4) ...

Merging the initial DMPOnline4 codebase into Roadmap

DMPonline4, this code was designed and implemented by the Digital
Curation Centre (DCC)
DMPonline runs in Ruby 2.1 and Rails 4.0, there is a mysql database.