adding expiration to short positions
adding expiration to output of shorts
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop