Add wallet scanning for filling new version shorts
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop

Conflicts:
	programs/web_wallet