replaces margin_order with 'Margin' short_order with 'Short' etc. #273
Switches to background-less avatars for everything.... #274
Fix importing wallet.  Error modal, disable button, better messages
adds Bit prefix to BitAssets in the market gui
fixes tabs display
merge upstream develop