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

Conflicts:
	config/config.properties
	dist/patch.txt
	src/com/lynk/hrm/domain/Dept.java
Merge branch 'master' of https://github.com/LynkLin/hrm-client.git