Task #3743: Committing changes related to merging the trunk into my task branch

.gitattributes

CEP/Calibration/BBSControl/scripts/plotwindow.py

CEP/GSM/bremen/recreate_tables.py

CEP/GSM/bremen/src/gsmconnectionmanager.py

CEP/GSM/bremen/src/gsmlogger.py

CEP/GSM/bremen/src/spectra.py

CEP/GSM/bremen/src/unifiedConnection.py

CEP/GSM/bremen/tests/bbsfiletest.py

CEP/GSM/bremen/tests/gsmconnection.py

CEP/GSM/bremen/tests/parset.py

CEP/GSM/bremen/tests/spectra.py

CEP/GSM/bremen/tests/utils.py

CEP/Pipeline/docs/design documentation/Pipeline.eap

CEP/Pipeline/docs/sphinx/source/author/index.rst

...ocs/sphinx/source/developer/lofarpipe/support/recipes.rst

...s/sphinx/source/developer/lofarpipe/tests/ingredients.rst

...peline/docs/sphinx/source/overview/dependencies/index.rst

CEP/Pipeline/docs/sphinx/source/pipelines/sip/index.rst

...e/pipelines/sip/pipeline_designs/calibration_pipeline.png

...ource/pipelines/sip/pipeline_designs/imaging_pipeline.png