Merge branch 'MOHEMM-Q3-DEV-LATEST' into MOHEMM-PHASE-2-SFH
# Conflicts:
# Mohem/resources/android/icon/drawable-hdpi-icon.png
# Mohem/resources/android/icon/drawable-ldpi-icon.png
# Mohem/resources/android/icon/drawable-mdpi-icon.png
# Mohem/resources/android/icon/drawable-xhdpi-icon.png
# Mohem/resources/android/icon/drawable-xxhdpi-icon.png
# Mohem/resources/android/icon/drawable-xxxhdpi-icon.png
# Mohem/resources/android/splash/drawable-land-hdpi-screen.png
# Mohem/resources/android/splash/drawable-land-ldpi-screen.png
# Mohem/resources/android/splash/drawable-land-mdpi-screen.png
# Mohem/resources/android/splash/drawable-land-xhdpi-screen.png
# Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png
# Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png
# Mohem/resources/android/splash/drawable-port-hdpi-screen.png
# Mohem/resources/android/splash/drawable-port-ldpi-screen.png
# Mohem/resources/android/splash/drawable-port-mdpi-screen.png
# Mohem/resources/android/splash/drawable-port-xhdpi-screen.png
# Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png
# Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png
# Mohem/src/app/app-routing.module.ts
# Mohem/src/app/app.component.html
# Mohem/src/app/app.component.ts
# Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
# Mohem/src/app/hmg-common/services/common/common.service.ts
# Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss
# Mohem/src/app/home/home.page.ts
# Mohem/src/app/my-team/details/details.component.ts
# Mohem/src/app/notification/home/home.component.html
# Mohem/src/app/notification/home/home.component.ts
# Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss
# Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss
# Mohem/src/app/notification/worklist-main/worklist-main.component.html
# Mohem/src/app/notification/worklist-main/worklist-main.component.ts
# Mohem/src/app/profile/home/home.component.ts
# Mohem/src/app/time-card/time-card-details/time-card-details.component.ts
|