removed db call from registrations_controller

Merge branch 'final_schema' of https://github.com/DigitalCurationCentre/roadmap into final_schema

URLs without locale param

trying to fix settings routes and views

sort out post merge issues

fix up post merge errors

resources -> resource

mege in head changes

trying to reduce data access queries. Needs more work

Merge branch 'final_schema' of https://github.com/DigitalCurationCentre/roadmap into final_schema

fixed bug where guidance_policy was attempting to prefetch question

Merge branch 'final_schema' of https://github.com/DigitalCurationCentre/roadmap into final_schema

app.pot re-generated

.pot and .po files re-generated

removed organisation_type admin interface as was causing conflicts

Merge branch 'final_schema' of https://github.com/DigitalCurationCentre/roadmap into final_schema

bugfixing update customized template

customizers can always add sections to a phase

removed slugs unique requirement from phases ** may break other code

updated show/edit for template publishing

added versioning/updating for customizations, and updated display logic for customizations on admin_index page

added customization function for only suggested_answers and annotations

views/shared and views/layours converted to gettext_rails

Merge pull request #20 from CDLUC3/final_schema ...

More unit tests and some cleanup

fixed Users menu item missing when refactoring

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

updated languages en-US en-UK to en_US en_UK

removing config/initializers/devise.rb. this is installation specific. default should be to sym link in your copy

Merge pull request #31 from DigitalCurationCentre/final_schema ...

started the migration from i18n to gettext

started the migration from i18n to gettext