update genesis
fix conflict
Merge pull request #171 from BitShares/master

Merge from Remote:BitShares