Merge Review Discussion

Diff to discuss the merge
fc was changed from Invictus to BitShares