merge
scale bts / vesting properly
Merge branch 'devshares' of https://github.com/BitShares/bitshares into devshares

Conflicts:
	devshares_genesis_v1.json
genesis revision