commit
Merge branch 'master' of https://github.com/maninsoft/winpackpi.git

Conflicts:
	winpackpi/WebContent/jsp/dailyShipping.jsp