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

Conflicts:
	leaveapp/employeeprofileservice/.project
	leaveapp/employeeprofileservice/src/main/java/com/beans/leaveapp/employee/model/Employee.java
	leaveapp/employeeprofileservice/src/main/java/com/beans/leaveapp/employee/repository/EmployeeRepository.java
	leaveapp/leaveapplication/src/main/java/com/beans/leaveapp/yearlyentitlement/service/YearlyEntitlementServiceImpl.java
	leaveapp/masterdataservice/src/main/java/com/beans/leaveapp/employeetype/repository/EmployeeTypeRepository.java
	leaveapp/masterdataservice/src/main/java/com/beans/leaveapp/leavetype/model/LeaveType.java
	leaveapp/masterdataservice/src/main/java/com/beans/leaveapp/leavetype/repository/LeaveTypeRepository.java
	leaveapp/masterdataservice/src/main/java/com/beans/leaveapp/leavetype/service/LeaveTypeService.java
	leaveapp/masterdataservice/src/main/java/com/beans/leaveapp/leavetype/service/LeaveTypeServiceImpl.java
	leaveapp/web/src/main/java/com/beans/leaveapp/leavetype/bean/LeaveTypeManagementBean.java
	leaveapp/web/src/main/java/com/beans/leaveapp/yearlyentitlement/bean/YearlyEntitlementManagementBean.java
	leaveapp/web/src/main/webapp/protected/leavetypemgmt.xhtml
	leaveapp/web/src/main/webapp/protected/systemAuditTrail.xhtml
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm into sprint1
Minor changes updated
minor changes updated
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm into
sprint1

Conflicts:
	SQLScripts/Overall.sql
	leaveapp/applyleaveflow/.classpath
	leaveapp/applyleaveflow/.project
	leaveapp/applyleaveflow/.settings/org.eclipse.jdt.core.prefs
	leaveapp/applyleaveflow/pom.xml
	leaveapp/applyleaveflow/src/main/java/com/beans/leaveapp/jbpm6/service/JBPM6ServiceImpl.java
	leaveapp/applyleaveflow/src/main/java/com/beans/leaveapp/jbpm6/util/JBPM6Runtime.java
	leaveapp/common/pom.xml
	leaveapp/common/src/main/java/com/beans/common/security/accessrights/model/AccessRights.java
	leaveapp/common/src/main/java/com/beans/common/security/accessrights/repository/AccessRightsRepository.java
	leaveapp/common/src/main/java/com/beans/common/security/accessrights/service/AccessRightsService.java
	leaveapp/common/src/main/java/com/beans/common/security/accessrights/service/AccessRightsServiceImpl.java
	leaveapp/common/src/main/java/com/beans/common/security/role/repository/RoleRepository.java
	leaveapp/common/src/main/java/com/beans/common/security/role/service/RoleService.java
	leaveapp/common/src/main/java/com/beans/common/security/role/service/RoleServiceImpl.java
	leaveapp/common/src/main/java/com/beans/common/security/users/repository/UsersRepository.java
	leaveapp/common/src/main/java/com/beans/common/security/users/service/UsersService.java
	leaveapp/common/src/main/java/com/beans/common/security/users/service/UsersServiceImpl.java
	leaveapp/common/src/main/java/com/beans/common/security/usertoaccessrights/model/UserToAccessRights.java
	leaveapp/common/src/main/java/com/beans/common/security/usertoaccessrights/repository/UserToAccessRightsRepository.java
	leaveapp/common/src/main/java/com/beans/common/security/usertoaccessrights/service/UserToAccessRightsNotFound.java
	leaveapp/common/src/main/java/com/beans/common/security/usertoaccessrights/service/UserToAccessRightsService.java
	leaveapp/common/src/main/java/com/beans/common/security/usertoaccessrights/service/UserToAccessRightsServiceImpl.java
	leaveapp/employeeprofileservice/.classpath
	leaveapp/leaveapplication/.project
	leaveapp/leaveapplication/.project~
	leaveapp/leaveapplication/pom.xml
	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/utilities/.classpath
	leaveapp/utilities/.settings/org.eclipse.wst.common.component
	leaveapp/utilities/src/main/resources/config/bpmn/bpmnresource.xml
	leaveapp/web/.settings/org.eclipse.wst.common.component
	leaveapp/web/.settings/org.hibernate.eclipse.console.prefs
	leaveapp/web/src/main/java/com/beans/leaveapp/accessrights/bean/AccessRightsManagement.java
	leaveapp/web/src/main/java/com/beans/leaveapp/role/bean/RoleManagement.java
	leaveapp/web/src/main/java/com/beans/leaveapp/roletoaccessrights/bean/RoleToAccessRightsManagement.java
	leaveapp/web/src/main/java/com/beans/leaveapp/usertorole/bean/UserToRoleManagement.java
	leaveapp/web/src/main/java/com/beans/leaveapp/web/bean/AuthenticationBean.java
	leaveapp/web/src/main/java/com/beans/leaveapp/web/bean/UserInfoBean.java
	leaveapp/web/src/main/java/com/beans/leaveapp/yearlyentitlement/bean/YearlyEntitlementManagementBean.java
	leaveapp/web/src/main/webapp/WEB-INF/spring/spring-employeeprofile.xml
	leaveapp/web/src/main/webapp/WEB-INF/spring/spring-masterdata.xml
	leaveapp/web/src/main/webapp/WEB-INF/spring/spring-security.xml
	leaveapp/web/src/main/webapp/WEB-INF/web.xml
	leaveapp/web/src/main/webapp/protected/accessRights.xhtml
	leaveapp/web/src/main/webapp/protected/department.xhtml
	leaveapp/web/src/main/webapp/protected/employeeType.xhtml
	leaveapp/web/src/main/webapp/protected/employeeprofile/employeeprofilemgmt.xhtml
	leaveapp/web/src/main/webapp/protected/employeeprofile/employeeprofileupdatedetails.xhtml
	leaveapp/web/src/main/webapp/protected/index.xhtml
	leaveapp/web/src/main/webapp/protected/role.xhtml
	leaveapp/web/src/main/webapp/protected/roletoaccessrightsmapping.xhtml
	leaveapp/web/src/main/webapp/protected/systemAuditTrail.xhtml
	leaveapp/web/src/main/webapp/protected/usertorolemapping.xhtml
	leaveapp/web/src/main/webapp/protected/yearlyentitlement.xhtml
	leaveapp/web/src/main/webapp/templates/menu.xhtml
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm into
sprint1

Conflicts:
	SQLScripts/Overall.sql
	leaveapp/applyleaveflow/.classpath
	leaveapp/applyleaveflow/pom.xml
	leaveapp/applyleaveflow/src/main/java/com/beans/leaveapp/jbpm6/service/JBPM6Service.java
	leaveapp/applyleaveflow/src/main/java/com/beans/leaveapp/jbpm6/service/JBPM6ServiceImpl.java
	leaveapp/applyleaveflow/src/main/java/com/beans/leaveapp/jbpm6/util/JBPM6Runtime.java
	leaveapp/applyleaveflow/src/main/resources/applyleave.bpmn
	leaveapp/common/src/main/java/com/beans/common/audit/service/SystemAuditTrailActivity.java
	leaveapp/common/src/main/java/com/beans/common/security/role/repository/RoleRepository.java
	leaveapp/common/src/main/java/com/beans/common/security/role/service/RoleService.java
	leaveapp/common/src/main/java/com/beans/common/security/role/service/RoleServiceImpl.java
	leaveapp/common/src/main/java/com/beans/common/security/users/service/UsersService.java
	leaveapp/common/src/main/java/com/beans/common/security/users/service/UsersServiceImpl.java
	leaveapp/employeeprofileservice/src/main/java/com/beans/leaveapp/employee/service/EmployeeService.java
	leaveapp/employeeprofileservice/src/main/java/com/beans/leaveapp/employee/service/EmployeeServiceImpl.java
	leaveapp/masterdataservice/src/main/java/com/beans/leaveapp/employeegrade/model/EmployeeGrade.java
	leaveapp/masterdataservice/src/main/java/com/beans/leaveapp/employeegrade/service/EmployeeGradeServiceImpl.java
	leaveapp/utilities/src/main/resources/config/bpmn/bpmnresource.xml
	leaveapp/utilities/src/main/resources/config/main.xml
	leaveapp/web/src/main/java/com/beans/leaveapp/employeegrade/bean/EmployeeGradeManagementBean.java
	leaveapp/web/src/main/resources/META-INF/persistence.xml
	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/WEB-INF/spring/spring-employeeprofile.xml
	leaveapp/web/src/main/webapp/WEB-INF/spring/spring-masterdata.xml
	leaveapp/web/src/main/webapp/login.xhtml
	leaveapp/web/src/main/webapp/protected/employeeGrade.xhtml
	leaveapp/web/src/main/webapp/protected/index.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
	leaveapp/web/src/main/webapp/templates/menu.xhtml
	leaveapp/web/src/test/java/com/beans/leaveapp/test/jbpm/JBPMRuntimeTest.java
	leaveapp/web/src/test/resources/META-INF/spring-jbpm.xml
	leaveapp/web/src/test/resources/META-INF/spring-masterdata.xml
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm into
sprint1

Conflicts:
	SQLScripts/Overall.sql
	leaveapp/masterdataservice/src/main/java/com/beans/leaveapp/department/model/Department.java
	leaveapp/masterdataservice/src/main/java/com/beans/leaveapp/department/service/DepartmentServiceImpl.java
	leaveapp/masterdataservice/src/main/java/com/beans/leaveapp/employeetype/model/EmployeeType.java
	leaveapp/masterdataservice/src/main/java/com/beans/leaveapp/employeetype/service/EmployeeTypeServiceImpl.java
	leaveapp/masterdataservice/src/main/java/com/beans/leaveapp/leavetype/service/LeaveTypeService.java
	leaveapp/masterdataservice/src/main/java/com/beans/leaveapp/leavetype/service/LeaveTypeServiceImpl.java
	leaveapp/web/src/main/java/com/beans/leaveapp/department/bean/DepartmentManagementBean.java
	leaveapp/web/src/main/java/com/beans/leaveapp/employeetype/bean/EmployeeTypeManagementBean.java
	leaveapp/web/src/main/webapp/WEB-INF/faces-config.xml
	leaveapp/web/src/main/webapp/protected/department.xhtml
	leaveapp/web/src/main/webapp/protected/employeeType.xhtml
	leaveapp/web/src/main/webapp/templates/menu.xhtml
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm into
sprint1

Conflicts:
	leaveapp/web/src/main/webapp/login.xhtml
	leaveapp/web/src/main/webapp/resources/css/loginlayout.css
	leaveapp/web/src/main/webapp/templates/mainlayout.xhtml