small change in tranlations: Cancel ... -> Cancel..
fix for price chart y axis issues
debug statements
Merge branch 'develop' of https://github.com/BitShares/web_wallet into develop
fix get_asset lookup by symbol
filter out market transactions in pull_my_trades
check for minimum short amount and displays a message to user
merge
Merge branch 'develop' of https://github.com/BitShares/web_wallet into develop
Merge pull request #11 from vikramrajkumar/develop

merge latest
fix for issue #330 - transactions and balances don't show up
Merge remote-tracking branch 'upstream/develop'
fix version to match client
fix version (this is not btsx)
show blockchain margin orders
revert GUI to be test net instead of BTSX
Merge branch 'develop' into btsx

Conflicts:
	app/js/controllers/unlockwallet.coffee
Revert "revert GUI to be test net instead of BTSX"

This reverts commit 26974dad0af3af032d988f5df189d75bd9538af0.
Merge pull request #14 from vikramrajkumar/btsx

merge latest