# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js

Merged TMSS-347 into TMSS-348

Resolved all conflicts

update the code for UI alignment

Updated the code to fetch SU Blueprints and Project UI changes

Resolve TMSS-319

Closes TMSS-319

See merge request !212

Included the Project list in Cycle view

Update header based on menu access

Resolve TMSS-345

Closes TMSS-345

See merge request !211

TMSS-345: Add test coverage for sideral time conversion and /api/util/utc and /api/util/lst endpoints

added scheduling list in project view page

Resolve TMSS-332 and TMSS-333

Closes TMSS-332

See merge request !208

Resolve TMSS-313

Closes TMSS-313

See merge request !207

Resolve TMSS-215

Closes TMSS-215

See merge request !210

added new feature for column customization, user can customize the column view in table

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/index.js

Resolved Conflicts and Close icon updated to be same in all screens. Chips label bottom margin removed.

Resolve TMSS-297

Closes TMSS-297

See merge request !209

# 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

Changes Updated based on Review Comments

Resolve TMSS-312

Closes TMSS-312

See merge request !206

TMSS-312: Updated schedule service to reduce API call duration. It reduced from 10 to 5 secs for scheduling unit blueprint view. Updated to show scheduling set name and styles for view.