Update.
Merge branch 'master' of https://github.com/LynkLin/hrm-client.git

Conflicts:
	config/config.properties
	dist/patch.txt
	src/com/lynk/hrm/biz/HrmBiz.java
	src/com/lynk/hrm/domain/WorkAttendanceDay.java
	src/com/lynk/hrm/domain/WorkShift.java
	src/com/lynk/hrm/ui/common/WorkAttendanceLevelColorRenderer.java
	src/com/lynk/hrm/ui/model/workattendance/WorkAttendanceMonthModel.java
	src/com/lynk/hrm/ui/model/workattendance/WorkAttendanceMonthSumModel.java
	src/com/lynk/hrm/ui/panel/WorkEmpAttendanceManager.java
	src/com/lynk/hrm/ui/panel/WorkEmpOvertimeManager.java