Merge branch 'master' into TMSS-297

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/App.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/list.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js

Resolved all conflicts