FIX: bad queries in batch management tool, bad form name in uploader
Merge branch 'master' into oo-fannie
Location-aware price-per-unit, minor add shelf tag fixes
Merge pull request #157 from CORE-POS/oo-fannie

Better price per unit