Extended the simple cost model with an additional parameter.
sdc
Merge origin/MainBranch into MainBranch

Conflicts:
	nbproject/private/private.properties