Merge branch 'release/v2.1' into develop
fixed uninitiated variable bug in Weight Calculator.  This is the actual submitted v2.1, not the tagged one.
Merge branch 'develop'