Sales Service

calculation corrected
Merge remote-tracking branch 'origin/master'

Conflicts:
	n9244255Sales/nbproject/private/private.xml
Revert "Sales Service"

This reverts commit 02126906163b914bad4ea89c52dfa7125603a5be.