Make TreatmentType generic in MTCModelWrapper (issue #545)
Move simulation controls to GeMTC (story #545)
Merge pull request #48 from joelkuiper/develop

TreatmentDefinitions and Categorizations

Fixed #535, #536, #537, #552, #553, #539
s/getDrugs/getTreatmentDefinitions/g in Study and DomainImpl

Signed-off-by: Joel Kuiper <me@joelkuiper.eu>
Ignore ctags generated tags files

Signed-off-by: Joel Kuiper <me@joelkuiper.eu>
s/getDrugs/getTreatmentDefinition some more
Add dummy wizard steps for NetworkMetaAnalysis, Rename drugs/definitions.

Story #538.
Merge branch 'develop' into mtc-components-to-gemtc

Conflicts:
	application/pom.xml
	application/src/integration-test/java/org/drugis/addis/util/JSMAAintegration/NetworkBenefitRiskIT.java
	application/src/main/java/org/drugis/addis/entities/mtcwrapper/AbstractSavedWrapper.java
	application/src/main/java/org/drugis/addis/gui/AnalysisComponentFactory.java
	application/src/main/java/org/drugis/addis/gui/ConvergencePlotsDialog.java
	application/src/main/java/org/drugis/addis/gui/ConvergenceSummaryDialog.java
	application/src/main/java/org/drugis/addis/gui/builder/MetaBenefitRiskView.java
	application/src/main/java/org/drugis/addis/gui/components/progressgraph/ProgressGraph.java
	application/src/main/java/org/drugis/addis/presentation/MetaBenefitRiskPresentation.java
	application/src/main/java/org/drugis/addis/presentation/NetworkMetaAnalysisPresentation.java
	application/src/main/java/org/drugis/addis/presentation/mcmc/MCMCPresentation.java
Merge branch 'develop' into mtc-components-to-gemtc

Conflicts:
	application/src/integration-test/java/org/drugis/addis/mtc/ContinuousInconsistencyModelIT.java
	application/src/integration-test/java/org/drugis/addis/util/JSMAAintegration/NetworkBenefitRiskIT.java
	application/src/main/java/org/drugis/addis/entities/analysis/NetworkMetaAnalysis.java
	application/src/main/java/org/drugis/addis/entities/mtcwrapper/AbstractSavedWrapper.java
	application/src/main/java/org/drugis/addis/entities/mtcwrapper/AbstractSimulationWrapper.java
	application/src/main/java/org/drugis/addis/entities/mtcwrapper/ConsistencyWrapper.java
	application/src/main/java/org/drugis/addis/entities/mtcwrapper/MCMCModelWrapper.java
	application/src/main/java/org/drugis/addis/entities/mtcwrapper/MTCModelWrapper.java
	application/src/main/java/org/drugis/addis/entities/mtcwrapper/SavedConsistencyWrapper.java
	application/src/main/java/org/drugis/addis/entities/mtcwrapper/SavedInconsistencyWrapper.java
	application/src/main/java/org/drugis/addis/entities/mtcwrapper/SavedNodeSplitWrapper.java
	application/src/main/java/org/drugis/addis/entities/mtcwrapper/SimulationConsistencyWrapper.java
	application/src/main/java/org/drugis/addis/entities/mtcwrapper/SimulationNodeSplitWrapper.java
	application/src/main/java/org/drugis/addis/gui/AddisMCMCPresentation.java
	application/src/main/java/org/drugis/addis/gui/builder/MetaBenefitRiskView.java
	application/src/main/java/org/drugis/addis/presentation/MetaBenefitRiskPresentation.java
	application/src/main/java/org/drugis/addis/presentation/NetworkInconsistencyFactorsTableModel.java
	application/src/main/java/org/drugis/addis/presentation/NetworkMetaAnalysisPresentation.java
	application/src/main/java/org/drugis/addis/presentation/NetworkRelativeEffectTableModel.java
	application/src/main/java/org/drugis/addis/presentation/NodeSplitResultsTableModel.java
	application/src/main/java/org/drugis/addis/util/jaxb/NetworkMetaAnalysisConverter.java
	application/src/test/java/org/drugis/addis/entities/mtcwrapper/AbstractSimulationWrapperTest.java
	application/src/test/java/org/drugis/addis/mocks/MockNetworkMetaAnalysis.java
	application/src/test/java/org/drugis/addis/presentation/NetworkTableModelTest.java
Remove ADDIS-specific code from Network*TableModel

Story #545
Move Network*TableModel to GeMTC (story #545)
Merge branch 'mtc-components-to-gemtc' into develop
Move resource to GeMTC (story #545)
Merge branch 'develop' of https://github.com/gertvv/addis into develop

* 'develop' of https://github.com/gertvv/addis:
  Move resource to GeMTC (story #545)
  Move Network*TableModel to GeMTC (story #545)
  Remove ADDIS-specific code from Network*TableModel
  Move simulation controls to GeMTC (story #545)
  Make TreatmentType generic in MTCModelWrapper (issue #545)

Conflicts:
	application/src/main/java/org/drugis/addis/entities/DomainImpl.java
	application/src/main/java/org/drugis/addis/entities/analysis/NetworkMetaAnalysis.java
	application/src/test/java/org/drugis/addis/util/jaxb/JAXBConvertorTest.java
Selectable TreatmentDefinitions for NetworkMetaAnalysis Wizard. 

Story #538.  Also merge #545 
Change StudyGraphModel to use TreatmentDefinition.match()

Story #538
Use refined list on appropriate places

Story #538.
Bugfixes for story #538

Signed-off-by: Joel Kuiper <me@joelkuiper.eu>