Merge branch 'gyng/master'
add alias `shipment rm' for `shipment del'
UX improvement: show status on add, reject invalid couriers
Merge branch 'master' into mergemaster