Worked on half day leave to display in email and in pages
Merge branch 'master' of https://github.com/kinmengBGM/bgmhrm

Conflicts:
	applyleaveflow/target/classes/META-INF/maven/com.beans/applyleaveflow/pom.properties
	leaveapplication/target/classes/META-INF/maven/com.beans/leaveapplication/pom.properties
	web/src/main/java/com/beans/leaveapp/calendar/service/CalendarEventService.java
	web/src/main/webapp/protected/applyleave/pendingLeaveTransactionList.xhtml