Merge remote-tracking branch 'origin/master' into develop
Merge branch 'develop' of https://github.com/BitShares/web_wallet into develop
Merge pull request #374 from AlexChien/chinese

Chinese Translation Catch Up
[market] updatable total fields in the buy,sell,short tabs
Merge branch 'develop' of https://github.com/BitShares/web_wallet into develop

Conflicts:
	app/static/locale-en.json
	app/templates/market/short.html
[market] fixed short blance link (auto populate form)
[transfers] fixed undefined exception when balance is zero
hides short tab for non-xts/btsx markets
errors notifications done right
fix for showing wrong tab issue after unlocking wallet
error notification minor improvement
added row click .01% collateral markup to suggested values in form... short form code cleanup
Merge branch 'develop' of github.com:BitShares/web_wallet into develop
stack trace now works in qt wallet; RpcService.request now accepts error handler as 3rd parameter
Merge branch 'develop' of https://github.com/BitShares/web_wallet into develop
added error_handler parameter to all rpc calls
fix for redirect to unlockwallet instead of create wallet issue
[market] scrolling to buy,sell,short tabs after a row is clicked and form is auto-populated
Merge branch 'develop' of github.com:BitShares/web_wallet into develop
help text added to market forms