Merge branch 'employee-branch-srinivas' of https://gitlab.mynisum.com/nmedarametla/demo-project-git-operations into employee-branch-srinivas

# Conflicts:
#	src/main/java/com/nisum/epe/demo/srinivas/Resource.java