5.20 final
Merge branch 'master' of https://github.com/jfsheen/haiso_hr

Conflicts:
	.idea/workspace.xml
	logs/info_log.log
	logs/warn_log.log
	src/main/java/com/haiso/commons/utils/DataTransfer/DataMappingUtil.java
	src/main/java/com/haiso/commons/utils/DataTransfer/DatePattern.java
	src/main/java/com/haiso/hr/web/controller/DataTransferController.java
	src/main/java/com/haiso/hr/web/controller/ajax/UploadFileAjaxController.java
	src/main/webapp/WEB-INF/ftl/DataTransfer/importDataMapping.ftl
0521