added an accessible_submit_button widget that displays a tooltip and cancels click event when button is disabled

reworked messaging for template-plan relationship DMPRoadmap/roadmap#150

fixed merge conflicts

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

Rebase with shib/orcid functionality and template fix

switched defined function over to unique combobox events because they were conflicting when m,ultple boxes on the same screen

finalized initial create plan js

added new create plan page

change docx export to htmltoword. Hopefully fixes: #217

Fixed Exporting settings. It works per phase. DMPRoadmap/roadmap#197

change from serialized hash tp just using includes

trying to fix settings routes and views

mege in head changes

trying to reduce data access queries. Needs more work

views/shared and views/layours converted to gettext_rails

started the migration from i18n to gettext

fixed a few merge conflicts

added theme unit tests and started cleanup of remaining existing tests

merge in changes from origin

first port of plan creation and editing to new data model

resolved merge conflicts

replaces Organisation. with Org. in all files

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

Merge branch 'master' of https://github.com/DMPRoadmap/roadmap into postgresql

fixed issue with policy check when saving changes to a plans export settings

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

removed all instances of comparing booleans to 1 or 0 for postgres compatability

Merging current stable development branch into master (#23) ...

This is our unofficial v.0.1.0 release. It includes:
- Rails 4.2 migration
- Internationalization
- API
- Institutional logo upload (thanks to Weiwei and the Univ. of Alberta)
- Generic branding
- General cleanup of code and bug fixes

fixed merge conflicts with fr and de locale files

Fixed issue with link to the terms page in the 'I accept the terms and conditions' link in the sign up section. The link is a part of the locale file, so created a variable called current_locale