Fix merge conflict
Merge pull request #68 from mastercoin-MSC/master

Sync to Master
Merge branch 'master' into dbstaging