added more labels to shipmarket
Merge origin/master