Merge branch 'master' into TMSS-239

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/package.json
#	SAS/TMSS/frontend/tmss_webapp/src/App.css
#	SAS/TMSS/frontend/tmss_webapp/src/App.js
#	SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
#	SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/services/cycle.service.js
#	SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js
#	SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
#	SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js

Resolved All Conflicts