upload
Merge remote-tracking branch 'origin/master'

Conflicts:
	sks-web/src/main/java/at/hofpur/pss/business/components/parcel/IParcelShippingComponent.java
	sks-web/src/main/java/at/hofpur/pss/business/components/parcel/ParcelShippingComponent.java
	sks-web/src/main/java/at/hofpur/pss/webServices/ParcelShippingServiceImpl.java
	sks-web/src/test/java/unitTests/bussiness/compontent/ParcelShippingComponentTest.java