Almost finish with shipments
Merge branch 'ws_dev' of https://github.com/diego-torres/SISOPREGA into ws_dev