Global navigation css migrated to new-catalog file
conflict fix
ui modified
Merge branch 'sunit' of github.com:adlakhavaibhav/HealthKartWeb into sachit
changes