fix
Merge branch 'develop' of github.com:liqites/warehouse into develop