2 second blocks for testing
multisig and cold storage acceptance tests #1002
change argument orders
Merge branch 'develop' of https://github.com/BitShares/bitshares into develop