Task #3566: Merged trunk with branch

.gitattributes

.gitignore

CEP/Calibration/BBSControl/scripts/plotwindow.py

CEP/Calibration/BBSControl/scripts/solverdialog.py

CEP/Calibration/BBSControl/scripts/solverquery.py

CEP/Calibration/BBSControl/src/bbs-reducer.cc

CEP/Calibration/BBSControl/src/bbs-shared-estimator.cc

CEP/DP3/AOFlagger/CMakeLists.txt

...Flagger/include/AOFlagger/gui/plot/plotpropertieswindow.h

CEP/DP3/AOFlagger/src/aoquality.cpp

CEP/DP3/AOFlagger/src/msio/memorybaselinereader.cpp

CEP/DP3/AOFlagger/src/strategy/actions/imageraction.cpp

...agger/src/strategy/algorithms/baselinetimeplaneimager.cpp

CEP/DP3/DPPP/include/DPPP/BaselineSelection.h

CEP/DP3/DPPP/include/DPPP/DPInfo.h

CEP/DP3/DPPP/include/DPPP/DPStep.h

CEP/DP3/DPPP/include/DPPP/Demixer.h

CEP/DP3/DPPP/include/DPPP/Filter.h

CEP/DP3/DPPP/include/DPPP/MSReader.h

CEP/DP3/DPPP/share/CMakeLists.txt