Merge branch 'master' of github.com:mastercoin-MSC/omniwallet into disable-prod