Fixed diaplay of shipment in second step.
Resolved conflicts in css
Merge branch 'master' of https://github.com/chromedia/online-distribution