Merge pull request #37 from seavor/jay

moved quantity functions to QuantityCtrl