Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares
fix for Incorrect highest bid displayed in market (shows price feed value) #460
Update README.md
Merge pull request #474 from Xeldal/patch-2

Update README.md
Merge pull request #476 from AlexChien/chinese

correct some Chinese translation inaccuracy
Create User Asset form refactoring #478
Merge branch 'master' into develop
Merge branch 'develop' into bitshares
Create and Issue User Asset forms refactoring #478
Change 'vote as delegates recommend' to 'vote as *my* delegates recommend' #477
#480 display inbox
#480 display inbox
GUI burn/post to wall support #482 - work in progress
Basic theming capability of splash screen using setting in preferences
By popular request, the Flowers background by Cass as the splashscreen background
Fixed delegate roles, added rank info to account view, added legal jurisdiction to info
Merge pull request #484 from svk31/develop

Theming settings for the splashscreen + Flowers theme
web_wallet mail work in progress #480