Fixed null bids and offers in short term market
Partially repaired short term structure
Merge remote-tracking branch 'origin/Develop' into Develop

Conflicts:
	debug.log
	velocity.log
	velocity.log.1
Merge branch 'ShortTermTesting' into Develop

Conflicts:
	velocity.log