Minor changes Done
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm.git into
sprint1

Conflicts:
	leaveapp/web/src/main/webapp/WEB-INF/faces-config.xml
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm.git into
sprint1

Conflicts:
	leaveapp/web/src/main/webapp/login.xhtml
	leaveapp/web/src/main/webapp/protected/accessRights.xhtml
	leaveapp/web/src/main/webapp/protected/role.xhtml
	leaveapp/web/src/main/webapp/protected/roletoaccessrightsmapping.xhtml
	leaveapp/web/src/main/webapp/resources/css/layout.css
	leaveapp/web/src/main/webapp/resources/css/loginlayout.css
	leaveapp/web/src/main/webapp/templates/mainlayout.xhtml
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm.git into
sprint1

Conflicts:
	leaveapp/pom.xml
	leaveapp/web/.project
	leaveapp/web/.settings/org.eclipse.jpt.core.prefs
	leaveapp/web/.settings/org.eclipse.wst.common.project.facet.core.xml
	leaveapp/web/.settings/org.hibernate.eclipse.console.prefs
	leaveapp/web/pom.xml
updated minor changes
Minor changes Updated
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm.git into
sprint1

Conflicts:
	leaveapp/applyleaveflow/src/main/java/com/sample/ProcessMain.java
	leaveapp/common/.project
	leaveapp/common/.settings/org.eclipse.wst.common.component
	leaveapp/common/pom.xml
	leaveapp/common/src/main/java/com/beans/common/audit/service/AuditTrail.java
	leaveapp/employeeprofileservice/.classpath
	leaveapp/employeeprofileservice/.project
	leaveapp/employeeprofileservice/pom.xml
	leaveapp/employeeprofileservice/src/main/java/com/beans/leaveapp/employee/service/EmployeeServiceImpl.java
	leaveapp/leaveapplication/.classpath
	leaveapp/leaveapplication/src/main/java/com/beans/leaveapp/yearlyentitlement/repository/YearlyEntitlementRepository.java
	leaveapp/leaveapplication/src/main/java/com/beans/leaveapp/yearlyentitlement/service/YearlyEntitlementService.java
	leaveapp/leaveapplication/src/main/java/com/beans/leaveapp/yearlyentitlement/service/YearlyEntitlementServiceImpl.java
	leaveapp/masterdataservice/.project
	leaveapp/masterdataservice/pom.xml
	leaveapp/masterdataservice/src/main/java/com/beans/leaveapp/department/service/DepartmentServiceImpl.java
	leaveapp/masterdataservice/src/main/java/com/beans/leaveapp/employeetype/service/EmployeeTypeServiceImpl.java
	leaveapp/pom.xml
	leaveapp/utilities/.project
	leaveapp/utilities/pom.xml
	leaveapp/utilities/src/main/java/com/beans/util/config/ConfigurationHolder.java
	leaveapp/utilities/src/main/resources/config/main.xml
	leaveapp/utilities/src/test/main/com/beans/test/util/config/ConfigurationHolderTest.java
	leaveapp/web/.project
	leaveapp/web/.settings/org.eclipse.jpt.core.prefs
	leaveapp/web/.settings/org.eclipse.wst.common.project.facet.core.xml
	leaveapp/web/pom.xml
	leaveapp/web/src/main/java/com/beans/leaveapp/yearlyentitlement/bean/YearlyEntitlementManagementBean.java
	leaveapp/web/src/main/webapp/WEB-INF/faces-config.xml
	leaveapp/web/src/main/webapp/WEB-INF/spring/spring-ds.xml
	leaveapp/web/src/main/webapp/protected/systemAuditTrail.xhtml
	leaveapp/web/src/main/webapp/protected/yearlyentitlement.xhtml
	leaveapp/web/src/main/webapp/resources/css/layout.css
	leaveapp/web/src/main/webapp/templates/menu.xhtml
minor changes updated
minor changes updated
Minor changes updated
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm.git into
sprint1

Conflicts:
	leaveapp/web/pom.xml