resolved merge conflicts

added and finalized unit tests for user, token_permission_types, identifier_Schemes, user_identifiers, organisations

removed version and updated users_roles to users_perms

made necissary changes to allow the app to display the splash/login screen

replaces Organisation. with Org. in all files

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

removed commented out code from admin/question.rb

removed the unused user_id field from the dmptemplates table

removed models and super admin pages for removed tables user_role_type, user_status, and user_type

removed domain and stylesheet_id from organisation. Both were unused on the front and back ends of the tool

removed role_in_plans, resource_id, and resource_type from the roles table. All were unused

Merge branch 'master' into postgresql

Corrected spelling of text_desription field in token_permission_types

removed description field from organisations in the super admin interface

removed user_org_roles from active admin

updated user organisation in active-admin

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.