resolved cherry-pick conflicts

URLs without locale param

started the migration from i18n to gettext

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

Removal of ajax calls from the Create Plan page (#31)

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

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.