Merge codes from remote
Merge branch 'master' of https://github.com/jessehwong/Attendance.git

Conflicts:
	src/main/java/com/jinfonet/attendance/dao/impl/LeaveDaoHbnImpl.java
	src/main/java/com/jinfonet/attendance/entity/Leave.java
Merge branch 'master' of https://github.com/jessehwong/Attendance.git