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

Conflicts:
	config/config.properties
	src/com/lynk/sm/ui/HskSmLogin.java
	src/com/lynk/sm/ui/model/ModelShipDetail.java
	src/com/lynk/sm/ui/panel/PaneAddShip.java