updated question_format and roles models

updated relations in question model

changed has_one to belongs_to in new_plans -> templates relationship

updated roles to perms as per renamed table

added new_plans relation to users through roles

added users to new_plan relationships

Merge branch 'development' of https://github.com/CDLUC3/roadmap into development

fixed issue with the oauth hash in the registrations controller

renamed hash_to_json_object in application_helper to hash_to_js_json_variable to make its purpose clearer

removed unused link_to_function and link_to_add_object methods from application_helper

added initial application_helper tests

added simplecov gem for testing to provide us with a test coverage report. Added a test for application_helper.rb. Removed tab characters from application_helper.rb and added some lines to help with readability

began changing models to reflect the new model names and relationships, additionally deleting some old/unused models which no longer apply in the new schema.

removed unused models

added migration to add foreign keys. Also needed to remove the temporary models, and update existing models to reflect the new relationships

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

Development

Resolved merge conflicts with fr.yml locale file and the user.rb model. Kept 'language_id' in the attr_accessible list and kept both the self.from_omniauth and reset_password_link methods.

updated code to write user-generated content (answers/notes)

fixes from feedback from french testing of dmponline

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

bugs found in fr dmponline

updated models for data migration

add a reset_password_link method for convenience

fix double sign-up bug: #69

get rid of explcit urls in admin/superadmin links

fixed nil check bug in registrations controller

Moved org specific telephone, address and google maps link to config/branding.yml

moved orcid and remove images to lib

Added registration controller tests, updated reference to Devise's deprectaed 'bypass' with bypass_sign_in', added some test helper to verify redirects to welcome page (for unauthorized attempts) and projects list page (for authorized). Added language_id back to attr_accessible on User model

Added authentication test and registration controller test. Added troubleshooting info to README. Added generic omniauth id to registration form