Merge pull request #26 from vikramrajkumar/btsx

Merge upstream
support for collateral_symbol parameter in wallet_market_submit_short
preferences page small refactoring
interface language preferences
shorts and depth charts labels; shors collateralization chart shows volume now, not collateral
[market] market order expriation text: days, hours, minutes
Merge branch 'develop' of github.com:BitShares/web_wallet into develop
[market] market order expriation text: days, hours, minutes ... added internationalization
[market] market order expriation text: more predictable unit changes
fixed null ptr
[market] market order expriation text: more predictable unit changes
failsafe in formatExpirationDate for missing translation
various cosmetic fixes
wallet api update
[market] consistent short reporting
Merge branch 'develop' of github.com:BitShares/web_wallet into develop
Merge branch 'develop' into btsx