classpath
merging
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm into
sprint1

Conflicts:
	leaveapp/employeeprofileservice/.classpath
	leaveapp/leaveapplication/.classpath
	leaveapp/utilities/.classpath
	leaveapp/web/.settings/org.eclipse.wst.common.component
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm into sprint1
Added User To Access Rights Entity
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm into sprint1
Search and paginated for Access Control
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm into
sprint1

Conflicts:
	leaveapp/utilities/src/java/main/com/beans/util/config/ConfigurationHolder.java
	leaveapp/utilities/src/java/main/com/beans/util/email/EmailSender.java
	leaveapp/utilities/src/java/main/com/beans/util/log/ApplLogger.java
	leaveapp/utilities/src/java/main/com/beans/util/validation/CustomValidator.java
	leaveapp/utilities/src/java/resources/config/audit/auditconfig.xml
	leaveapp/utilities/src/java/resources/config/email/emailconfig.xml
	leaveapp/utilities/src/java/resources/config/main.xml
	leaveapp/web/src/main/resources/META-INF/persistence.xml
	leaveapp/web/src/main/webapp/protected/systemAuditTrail.xhtml
	leaveapp/web/src/main/webapp/protected/yearlyentitlement.xhtml
	leaveapp/web/src/test/java/com/beans/leaveapp/leavetype/test/LeaveTypeRepositoryTest.java
User To Access Rights
user to access rights
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm into sprint1
Leaveapp
made changes to User To Access Rights
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm into
sprint1

Conflicts:
	leaveapp/applyleaveflow/.project
	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/src/main/java/com/beans/common/security/role/repository/RoleRepository.java
	leaveapp/employeeprofileservice/.settings/org.eclipse.wst.common.component
	leaveapp/leaveapplication/.project
	leaveapp/leaveapplication/.project~
	leaveapp/utilities/.settings/org.eclipse.wst.common.component
	leaveapp/web/.settings/org.eclipse.wst.common.component
	leaveapp/web/.settings/org.hibernate.eclipse.console.prefs
	leaveapp/web/src/main/resources/META-INF/persistence.xml
	leaveapp/web/src/main/webapp/WEB-INF/beans.xml
	leaveapp/web/src/main/webapp/WEB-INF/faces-config.xml
	leaveapp/web/src/main/webapp/WEB-INF/spring/spring-masterdata.xml
	leaveapp/web/src/main/webapp/protected/systemAuditTrail.xhtml
	leaveapp/web/src/main/webapp/protected/yearlyentitlement.xhtml
changes to leaveapplication
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm into sprint1
changes in usertoaccessrightsmapping.xhtml