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/common/Utils.java
	src/com/lynk/hrm/ui/HrmApp.java
	src/com/lynk/hrm/ui/dialog/InfoEmployee.java
	src/com/lynk/hrm/ui/dialog/InfoIdCardPicture.java
	src/com/lynk/hrm/ui/dialog/PrinterCartridgeInfo.java
	src/com/lynk/hrm/ui/dialog/RosterInfo.java
	src/com/lynk/hrm/ui/dialog/ShiftManager.java
	src/com/lynk/hrm/ui/dialog/TimeCardSync.java
	src/com/lynk/hrm/ui/dialog/TrainingFormDownload.java
	src/com/lynk/hrm/ui/dialog/TrainingInsert.java
	src/com/lynk/hrm/ui/dialog/TrainingTitleDetail.java
	src/com/lynk/hrm/ui/dialog/TrainingTitleList.java
	src/com/lynk/hrm/ui/model/ZktecoMachineModel.java
	src/com/lynk/hrm/ui/panel/EmployeeReportManager.java
	src/com/lynk/hrm/ui/panel/ListTimeCard.java
	src/com/lynk/hrm/ui/panel/PrinterManager.java
	src/com/lynk/hrm/ui/panel/RosterManager.java
	src/com/lynk/hrm/ui/window/ZktecoMonthReportWindow.java