Adjusted value of shortfall for purchasers to be set in all variables
Merge branch 'Test_Tues25Nov' into Develop

Conflicts:
	bin/nemmcommons/AllVariables.class
Purchaser utility uses cert val
Merge remote-tracking branch 'origin/Develop' into Develop

Conflicts:
	bin/nemmcommons/AllVariables.class
	velocity.log
Merge branch 'Test_Tues25Nov_v2' into Develop

Conflicts:
	bin/nemmagents/MarketAnalysisAgent.class
	src/nemmagents/MarketAnalysisAgent.java
	velocity.log