Task #2993: merged trunk into branch for JAVA and OTB/OTB and OTB/jOTDB3

.gitattributes

.gitignore

SAS/OTB/OTB/pom.xml

...B/src/nl/astron/lofar/sas/otb/util/ConfigPanelHelper.java

...B/src/nl/astron/lofar/sas/otb/util/ResultPanelHelper.java

...n/lofar/sas/otb/util/tablemodels/ComponentTableModel.java

...r/sas/otb/util/tablemodels/DefaultTemplatetableModel.java

.../astron/lofar/sas/otb/util/tablemodels/PICtableModel.java

...on/lofar/sas/otb/util/tablemodels/TemplatetableModel.java

.../astron/lofar/sas/otb/util/tablemodels/VICtableModel.java

.../src/nl/astron/lofar/sas/otbcomponents/AnaBeamDialog.form

.../src/nl/astron/lofar/sas/otbcomponents/AnaBeamDialog.java

...nl/astron/lofar/sas/otbcomponents/AntennaConfigPanel.form

...nl/astron/lofar/sas/otbcomponents/AntennaConfigPanel.java

...rc/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.form

...rc/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.java

.../src/nl/astron/lofar/sas/otbcomponents/NodeViewPanel.form

.../src/nl/astron/lofar/sas/otbcomponents/NodeViewPanel.java

...l/astron/lofar/sas/otbcomponents/ParSetMetaViewPanel.java

...rc/nl/astron/lofar/sas/otbcomponents/ParSetViewPanel.form