Merge pull request #31 from mastercoin-MSC/master

Sync to Master
Fix Trade filter errors
Merge branch 'core' of https://github.com/achamely/omniwallet into core
Merge pull request #650 from achamely/core

Fix Trade page filter