Revert "withdraw vesting type"

This reverts commit 7480ff3bd55de13cd10bfcf3f5c3bd55fc4bebf1.
Revert "merge withdraw types"

This reverts commit 85aa07a1376e9fdee18a4f695f9ef7b2372a8db5.
Merge branch 'develop' of https://github.com/BitShares/bitshares_toolkit into develop