TMSS-393: Resolved conflicts when merged from master

.gitlab-ci.yml

.../etc/parset-additions.d/default/StationCalibration.parset

SAS/TMSS/docker-compose-ua.yml

SAS/TMSS/frontend/tmss_webapp/package.json

SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js

...MSS/frontend/tmss_webapp/src/layout/components/AppMenu.js

...rontend/tmss_webapp/src/layout/components/CustomDialog.js

.../frontend/tmss_webapp/src/layout/components/PageHeader.js

SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js

SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js

SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js

.../tmss_webapp/src/routes/Reservation/reservation.create.js

...nd/tmss_webapp/src/routes/Reservation/reservation.edit.js

...nd/tmss_webapp/src/routes/Reservation/reservation.list.js

...d/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js

...d/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js

...TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js

SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js

...s_webapp/src/routes/Scheduling/excelview.schedulingset.js

SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js