resolved merge conflicts

cleaned up tests

finsihed phase unit tests. added all unit tests that i forgot to add in prior commits

added unit test for phases and updated readme with links out to wiki docs

updated phase so that it dosent delete a template when destroyed

attempted to add some unit tests for Answers but the data will be changing so much that it did not make sense to continue at this point. Created tests for Language

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

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.

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

fixed bug where templates were not based on most recent version, causing organizational customizations of templates to not show up to the end user

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.