Delegate config refactoring; #1147
Merge branch 'develop' of github.com:BitShares/bitshares into develop