Task #3064: Merged trunk with branch

.gitattributes

CEP/Calibration/BBSControl/src/Step.cc

CEP/Calibration/BBSKernel/CMakeLists.txt

CEP/Calibration/BBSKernel/include/BBSKernel/CMakeLists.txt

...tion/BBSKernel/include/BBSKernel/Expr/AntennaElementHBA.h

...tion/BBSKernel/include/BBSKernel/Expr/AntennaElementLBA.h

...n/BBSKernel/include/BBSKernel/Expr/AntennaFieldThetaPhi.h

...on/BBSKernel/include/BBSKernel/Expr/ParallacticRotation.h

CEP/Calibration/BBSKernel/include/BBSKernel/Instrument.h

...Calibration/BBSKernel/include/BBSKernel/MeasurementAIPS.h

...ration/BBSKernel/include/BBSKernel/MeasurementExprLOFAR.h

...on/BBSKernel/include/BBSKernel/MeasurementExprLOFARUtil.h

CEP/Calibration/BBSKernel/include/BBSKernel/ModelConfig.h

...alibration/BBSKernel/include/BBSKernel/StationExprLOFAR.h

...Calibration/BBSKernel/include/BBSKernel/StationResponse.h

CEP/Calibration/BBSKernel/src/CMakeLists.txt

CEP/Calibration/BBSKernel/src/Contrib/CMakeLists.txt

CEP/Calibration/BBSKernel/src/ElementBeamExpr.cc

CEP/Calibration/BBSKernel/src/Expr/AntennaElementHBA.cc

CEP/Calibration/BBSKernel/src/Expr/AntennaElementLBA.cc