Merge remote-tracking branch 'origin/master'

Conflicts:
	SC_HTTP_TEST/src/com/isec/sc/api/exec/CallAPIAdInv.java
	SC_HTTP_TEST/src/com/isec/sc/api/inv/AdjustInventory.java