FIX: bad queries in batch management tool, bad form name in uploader
Merge branch 'master' into oo-fannie
Go straight to drawer management if no drawer is available
Merge pull request #156 from CORE-POS/dual-drawer

Go straight to drawer management if no drawer is available
Location-aware price-per-unit, minor add shelf tag fixes
Merge remote-tracking branch 'origin/master' into akt-master
Merge pull request #157 from CORE-POS/oo-fannie

Better price per unit
Merge remote-tracking branch 'origin/master' into akt-master
Forgot the actual new API file
Merge branch 'oo-fannie' into akt-master