Merge pull request #17 from vikramrajkumar/btsx

Merge upstream
fix for shorts collateral ratio display
fixed submti button bug; started working on editable total field
Merge branch 'develop' into btsx