Merge branch 'develop' of github.com:gertvv/addis into develop

* 'develop' of github.com:gertvv/addis:
  Update README for 1.14
  Add design document for treatment categorizations
Merge branch 'develop' of github.com:joelkuiper/addis into develop

* 'develop' of github.com:joelkuiper/addis:
  Bump version to 1.15.1-SNAPSHOT
Merge branch 'develop' of github.com:joelkuiper/addis into develop

* 'develop' of github.com:joelkuiper/addis:
  Missing files for 1.14.1
  Change notation in the inconsistency factors to "median (95% CrI)"
  Automated changes for 1.14.1
  Prevent removal of epochs when they are already used in a study
  Depend on drugis-common 0.5.3-SNAPSHOT
  Fix story #548
  Cleanup.
  FIx story #549
  Added missing line for clearing the validators on panel rebuild
  Fixed #547 On ClinicalTrials.gov import, can not edit activities table
Merge branch 'develop' of github.com:joelkuiper/addis into develop

* 'develop' of github.com:joelkuiper/addis: (82 commits)
  Add XML save and load of TreatmentCategorizations
  Add schema for converting TreatmentCategorizations
  Rename Dose(d)Drug* to TreatmentCategorization
  Automated changes for 1.15.1
  Version to 1.15.1
  Repackage 1.14.1
  Bugfix Study.clone() and Study.addStudyOutcomeMeasure()
  Disable remove category when category is used
  Fixed test for story #536
  Move  CategorySpecifiers to wizard presentation
  Cleanup
  Take into account previous range when constructing new edge
  Fix multiple ranges window for wizard
  Use cellrenderer for comboboxes in the WizardSteps
  AddDosedDrugTreatmentWizard additions (story #535):
  Move beans code to common
  Work around JUNG bug: removeVertex modifies the list over which it iterates
  Make Category.PROPERTY_NAME editable
  Move DoseUnit constant so that it can be referenced from non-test code.
  Split WizardPresentation from DosedDrugTreatmentPresentation
  ...
Merge branch 'develop' of github.com:joelkuiper/addis into develop

* 'develop' of github.com:joelkuiper/addis:
  Move TreatmentCategorySet back to proper package (story #537)
  Add failing (ignored) test for category matching in MetaAnalysis (story #537)
  Better constructor for RandomEffectsMetaAnalysis (story #537)
  s/Drug/Alternative/ in *MetaAnalysis (story #537)
  Move deprecated MetaAnalysis construction method to ExampleData (story #537)
  Global s/DrugSet/TreatmentCategorySet/ (story #537)
  Introduce factory for DrugSet constructors
  NetworkBuilderFactory transformers support TreatmentCategorySet (story #537)
  deepEquals for Category, TreatmentCategorization, TreatmentCategorySet (story #537)
  Refactor NetworkBuilderFactory and simplify tests (story #537)
  Initial TreatmentCategorySet to replace DrugSet (story #537)
  TreatmentCategorizations equal/compare on drug as well as name (story #537)
  Factory method for trivial categories and Category.getLabel (story #537)
  TreatmentCategorization factory methods and trivial categorizations (story #537)
  Add TreatmentCategorization to Category (story #537)
  Fix Round Trip test for TreatmentCategorizations XML (Story #552)
  Fix doseUnit dependencies
Merge branch 'develop' of github.com:joelkuiper/addis into develop

* 'develop' of github.com:joelkuiper/addis:
  Start architecture documentation
  Cleanup
  Change JAXB converters to use new schema with TreatmentDefinitions
  Move JAXB resources to appropriate package
  XSD and XSLT for TreatmentDefinition uses in analyses (story #553)
  XSD decision tree changes (story #552)
  MetaBenefitRisk: cleanup and bugfixes (story #537)
  Rename MetaBenefitRiskAnalysis.drugs to alternatives (story #537)
  Fix TreatmentCategorizationTest (story #537)
  MetaAnalysis: consistency checking based on TreatmentDefinition.match (story #537)
  Add TreatmentDefinition.match(TreatmentActivity), story #537
  Add match(AbstractDose) and match(DrugTreatment) to Category, story #537
  Shortcut for creating FlexibleDoses, story #537
  Rename TreatmentCategorySet to TreatmentDefinition, story #537
Merge branch 'develop' of github.com:joelkuiper/addis into develop

* 'develop' of github.com:joelkuiper/addis:
  Bugfixes for story #538
  Use refined list on appropriate places
  Change StudyGraphModel to use TreatmentDefinition.match()
  Selectable TreatmentDefinitions for NetworkMetaAnalysis Wizard.
  Move resource to GeMTC (story #545)
  Move Network*TableModel to GeMTC (story #545)
  Remove ADDIS-specific code from Network*TableModel
  Add dummy wizard steps for NetworkMetaAnalysis, Rename drugs/definitions.
  s/getDrugs/getTreatmentDefinition some more
  Ignore ctags generated tags files
  s/getDrugs/getTreatmentDefinitions/g in Study and DomainImpl
  Move simulation controls to GeMTC (story #545)
  Make TreatmentType generic in MTCModelWrapper (issue #545)
Merge branch 'develop' of github.com:joelkuiper/addis into develop

* 'develop' of github.com:joelkuiper/addis:
  Automated changes for 1.15.2 release
  Use correct antrun version
  Comment out uncompiling PairWiseMetaAnalysis for development release
  Temporarily disable PairWiseMetaAnalysis for development release
  Use TreatmentDefinitions in NetworkMetaAnalysis with working wizard.
  Use composition instead of inheritance for StudyTableModel
  NetworkMetaAnalysisWizard: build refined graph (story #538)
  Bugfix: study to use TreatmentDefinition.match (story #537)
  Reorganize MetaAnalysis wizards (story #538)
  Move more code to GeMTC and common (story #545)
  Fix references to GeMTC (story #546, #545)
  Refactor naming of NetworkMetaAnalysisWizardPM; extend and fix tests. story #538
  Improved XML diagram
  Extract architecture docs to LaTeX
  Additional architecture documentation
  Get rid of some maven warnings (bug #559)
  Stop using XMLGregorianCalendarImpl (bug #559)
  Stop using DataTransferer (bug #559)
  Version to 1.15.2-SNAPSHOT
Merge branch 'develop' of github.com:joelkuiper/addis into develop

* 'develop' of github.com:joelkuiper/addis:
  Fix TreatmentCategorizationWizardTest by adding domain
  Simplify getNameModel in AddTreatmentCategorizationWizardStep
  Use propertyName constants in getShownProperties
  Addendum fixed #557 also use background color
  Prevent duplicate TreatmentCategorizations in domain
  Prevent duplicate or empty category names (story #557)
  Move IndifferentListDataListener to drugis-common
  Fix broken unit tests
  Pairwise MA wizard: fill in refined from raw if trivial (fixed #538)
  Rebuild arm selection in WizardStep.prepare (story #538)
  Merge indication and outcomeMeasure selection in MetaAnalysisWizard
  Use TreatmentDefinitions in PairWiseMetaAnalysisWizard
  Remove deprecated method
  Do not reset selection when entering SelectDrugs step (story #538)
  Make PairWiseMetaAnalysis Wizard work with graph
  Remove AbstractMetaAnalysisWizard and rebase PairWiseMetaAnalysis
  Revert "Revert "Automated changes for 1.15.2 release""
  Revert "Temporarily disable PairWiseMetaAnalysis for development release"
  Revert "Comment out uncompiling PairWiseMetaAnalysis for development release"
  Revert "Automated changes for 1.15.2 release"
Merge branch 'develop' of github.com:joelkuiper/addis into develop

* 'develop' of github.com:joelkuiper/addis:
  Work in progress (non functional!) for story #558
  Replace FilteredObservableList.Filter by Predicate from commons-collections
  Use AffixedObservableList instead of SuffixedObservableList
  Use AffixedObservableList (fixed #564)
  Cleanup
  Added working progress for Diabetes Example Data (story #562)
  Remove unneeded debug information
  Add clean-up utility for Diabetes dataset
  Architecture requirements
  Minor fixes
  Architecture: add potential future architecture
Merge branch 'develop' of github.com:gertvv/addis into develop

* 'develop' of github.com:gertvv/addis:
  Some additions to diabetes example
  Add to diabetes example; some fixes
  Encapsulate MILLIGRAMS_A_DAY to force clone
Merge branch 'develop' of github.com:woutgg/addis into develop

* 'develop' of github.com:woutgg/addis:
  Moved memory usage tab from addis to mtc (story #545)
  Remove unused class
  Finished code review of DrugSet -> TreatmentDefinition replacement (story #563)
  Moved buildNodeSplitDensityChart to MTC (story #545)
  Finished implementation of decision tree deepEquals() (fixed #558)
  Minor fixes to architecture document
Merge branch 'develop' of github.com:joelkuiper/addis into develop

* 'develop' of github.com:joelkuiper/addis:
  Version to 1.15.4-SNAPSHOT
  Fix #554 BR: measurements conformant to EMA "effects table"
  Jump to TreatmentCategorization when double clicking in table
  Fix #568 Textual representation of treatment categories
  Automated changes for 1.15.3
  Move files to GeMTC story #545
  Version to 1.15.3
  Simplify CopyrightInfo (removes trailing whitespace from header)
  Remove unneeded test for checking number of Endpoints
  Fix story #560 Terminate dialogs with dispose(), not setVisible(false)
  Fix #556 After removing all uses of Epoch, still can not delete.
  Fix unit tests for DoseUnit.equals
  Use the correct equals after flatten of TreatmentDefinitions
  Use MainWindow (from GeMTC) for the delete icon
  Properly use DoseUnit.createMilliGramsPerDay in test
  Terminate dialogs with dispose(), not setVisible(false)
  Add scrollbars (more than two) to TreatmentCategorizationView
Merge branch 'develop' of github.com:joelkuiper/addis into develop

* 'develop' of github.com:joelkuiper/addis:
  Addendum commit 3c44b931de, story #570
  Experiment for #569 TreatmentCategorization Decision Tree view does not have proper height
  Fix #570 Set domain as modified after applying XSLT
  Whitespace
  Clean-up
Fix unit tests for story #554 

Signed-off-by: Joël Kuiper <me@joelkuiper.eu>