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

Conflicts:
	config/config.properties
	src/com/lynk/hrm/ui/dialog/InfoPraisePunish.java
	src/com/lynk/hrm/ui/model/PraisePunishModel.java
	src/com/lynk/hrm/ui/panel/PraisePunishManager.java