Default ordering for Phase, Question becomes .number - closes #402

updated super admin to use annotations and model files accordingly

merged development into annotations

fixed bug with annotation selection

began updating org-admin display of suggested_answers

updated references of suggested_answer to annotations

moved some of the logic that was defaulting template attributes in the controller over to the model. Fixed tests DMPRoadmap/roadmap#251 DMPRoadmap/roadmap#273

moved most of the save logic from the template controller to the model. Updated the phases/section/question models to use the after_save callback to handle updating the template.dirty flag

added a test that searches for missing translations. Added specific error messages for model validations. Added some devise controlled error messages to pot/po files DMPRoadmap/roadmap#236

fix merge conflicts

change from serialized hash tp just using includes

I18n replaced from models. DMPRoadmap/roadmap#98

minor fixes from code review

Optimistic Locking ...

- add bit field to question_format so we don't have to test strings to determine format

- add isOptionBased to question so we dn't have to do multiple string comps for this - there was a boolean already in the DB not being used

- add migration to add bit field

- add migration to add lock_version field to answer

- change answers_controller to do optimistic locking

- change answers controller not to redirect to plans/phase/edit as it wasn't doing anything

- introduced answers/update.js.erb to handle the return from /answers/update.

- to do the conflict resolution you need the old answer and new answer objects. Tried using clone but it doesn't work because it only does a shallow copy. So adopted a "nuclear-option" deep copy but it's a bit much. A compromise would be better.

re-wrote guidance_for_org fuction to hit the db less

fixed minor typo in deep_copy for question

updated generic deep copy test to check for uniqueness of excluded attributes (e.g. id, slug, dates, etc.). Fixed typo in Question.deep_copy. Added calls to deep_copy test for template, phase and section

removed old references to the Amoeba gem which was used to clone models. Fixed typo in Question.deep_copy. Added generic test for deep_copy methods.

removed old amoeba gem that was used for cloning active record models. We will use xsrust's new deep_copy methods now

init commit of deep_copy for templates [untested]

added unit tests for question. removed unused methods from question. fixed guidance_for_question method so that it does not require us to pass in itself (was qustion.guidance_by_question(question, org) - now question.guidance_for_org(org)) and updated template that calls method accordingly

initial uni tests for question

Merge branch 'final_schema' into final_schema

bugfixed display logic for editing phase, modifiability of questions, mass-assignment of questions

updated admin_previewphase action in templates controller

added new seed file that works with new schema. commented out plans and answers for now though because plan model is unfinished

resolved merge conflicts

updated additional parts of the admin_phase view to use the new schema's data access. Additionally changed models for suggested_answer, user, guidance_group and question to better reflect the associations in the schema

updated attr_accessible lines to allow mass assignment of associations via object instead of id

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