shipments, focus stuff, small fixes
Merge branch 'master' of github.com:jasonknight/salor-retail
blank instead of empty
build