issue

[Jagan]: Changing IP Address

[$umith]

Mt 52

Reverted

[MT-53] Mahesh: Import Employee details from Excel sheet

Date of Joining in Dashboard
MT-51: Capture the project team mate status with dates

successful

Dashboard Issue fixed
MT-48: Add domain and capture the details in ManageEmployee screen. Show
in Dashboard and profile screen

Mt 43

Conflicts:
	src/main/java/com/nisum/mytime/controller/UserController.java
	src/main/java/com/nisum/mytime/service/UserService.java
	src/main/java/com/nisum/mytime/service/UserServiceImpl.java

MT-41: Update Designation while in Manage Employees
MT-42: Active Employee : Capture if employee is active or inactive(left
org). By default on emp creation,set active to true.
MT-40: Capture Functional Group and show in Employee details and
Dashboard

[MT-44] Mahesh: Search by Name/email id/Emp Id  in Employee Details

screen for HR HR Manager DIrector roles.

MT-43[Rajeshekar]:Updated Manage Employee to update location

MT-43[Rajeshekar]: Added work location feature