Merge branch 'master' into L2SS-404-archiving-setup-development

.gitattributes

...evice-base/WSRT_Measures_stub/ephemerides/DE200/table.dat

...device-base/WSRT_Measures_stub/ephemerides/DE200/table.f0

...evice-base/WSRT_Measures_stub/ephemerides/DE200/table.f0i

...vice-base/WSRT_Measures_stub/ephemerides/DE200/table.info

...vice-base/WSRT_Measures_stub/ephemerides/DE200/table.lock

tangostationcontrol/tangostationcontrol/beam/delays.py

tangostationcontrol/tangostationcontrol/beam/test_delays.py

tangostationcontrol/tangostationcontrol/devices/beam.py

...ostationcontrol/tangostationcontrol/test/beam/__init__.py

...ationcontrol/tangostationcontrol/test/beam/test_delays.py