Fix build

I broke the build with my conflict resolution. I'm sorry. :(
Merge branch 'master' of github.com:BitShares/bitshares_toolkit