# Conflicts:
#	src/main/resources/application.properties

User management

Updated code for scheduler

# Conflicts:
#	src/main/java/org/upsmf/grievance/controller/FeedbackController.java

Changes related to dashborad API

Code for serach keyword and sort mapping

committing for active deactive api's

commiting for integrate create, update ,get users Api's

Added code for correct response from elastic search

Added code for Dashboard API

commit for integrating api's

Added changes related to date range,status and cc

Changes related to elastic search for tickets

Pagination related chnages

User management