updated users_controller to use perms constants

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

bugfixing update customized template

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

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

started the migration from i18n to gettext

started the migration from i18n to gettext

removed test logging from omniauth controller

updted some stale references to Project and Dmptemplate. built more unit tests for Plan methods. Commented out a lot of methods that appear to be unused

removed NewPlan, AdminUser models. Updated API base controller to check auth via token type and org

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

customizations generate new templates or template versions

some cleanup of irrelevant objects (e.g. removal of remaining OrganisationType)

removed references to organisation_id in several models and replaced with .org.id

added some missing unit tests. fixed typo on Template.has_customisations? method

initial customization functionality

fixed bug where sections not editable, questions not saveable

first step in reducing page edit sql queries

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

move plan list settings from project to plan

added answers_controller tests

fixed issue with routes test

init commit of deep_copy for templates [untested]

fixed bugs introduced into templates by merge

fixed a few merge conflicts

added theme unit tests and started cleanup of remaining existing tests

fixes post merge

merge in changes from origin

first port of plan creation and editing to new data model