Merge pull request #4 from mastercoin-MSC/master

Merged
issue 889
Merge pull request #979 from achamely/dbstaging

Fix merge conflicts
Merge pull request #977 from NadavSch/issue_899

Issue 899
Merge pull request #980 from mastercoin-MSC/master

Sync to Master
Merge pull request #70 from mastercoin-MSC/database-staging

Sync to Master