refactor
Merge branch 'master' of https://github.com/jessehwong/AttendanceNew.git

Conflicts:
	WebContent/annualHolidayList.jsp
	WebContent/right.jsp
	src/com/jinfonet/attendance/action/AnnualHolidayAction.java
	src/com/jinfonet/attendance/action/AttendanceAction.java
	src/com/jinfonet/attendance/mail/MailSender.java
	src/com/jinfonet/attendance/service/AttendanceService.java