fix error reporting on wallet name
fix conflict
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop
fix conflicts