Merge remote-tracking branch 'origin/master' into develop
debug statements
Merge branch 'develop' of https://github.com/BitShares/web_wallet into develop
fix get_asset lookup by symbol
working on candlestick price chart
merged with develop
merge
Merge branch 'develop' of https://github.com/BitShares/web_wallet into develop
working on order book chart
fix for issue #330 - transactions and balances don't show up
added vertical avg. price line to order book chart
fix version to match client
Merge branch 'develop' of https://github.com/BitShares/web_wallet into highcharts
fix version (this is not btsx)
show blockchain margin orders
order book chart based on highcharts
Merge branch 'develop' into highcharts
revert GUI to be test net instead of BTSX
translation improvements (thanks testz for russian translation)
Merge branch 'develop' of https://github.com/BitShares/web_wallet into develop