production/comsumption details on right side now properly reflect production factors
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/structures/Structure.java