Update.
Merge branch 'master' of https://github.com/LynkLin/hsk-shipment.git

Conflicts:
	config/config.properties
	dist/patch.txt
	src/com/lynk/sm/dao/SmSqlDao.java