# Conflicts:
#	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/_layout.scss
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Project/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Project/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/ScheduleService.js
#	SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js

Resolved Conflicts. Updated styles, links, icons and positions in page header.