[Shipment] changed view Index.aspx and controller ShipmentController
Merge branch 'master' of https://github.com/krzysiuk12/SpringMvc.git