issue 772 update
issue 889
update js file locations
Fix merge conflict
Merge pull request #68 from mastercoin-MSC/master

Sync to Master
Merge pull request #977 from NadavSch/issue_899

Issue 899
populate txhash so orderbook doesn't crash on 0 results
Merge pull request #991 from achamely/master

Fix DEx error loop on no returns
Merge pull request #71 from mastercoin-MSC/master

Sync to Master
issue 645
Merge branch 'issue_772_update' of https://github.com/NadavSch/omniwallet
Merge pull request #975 from NadavSch/issue_772_update

Issue 772 update
clean up extra character
Merge pull request #75 from mastercoin-MSC/master

Sync to Master
Merge pull request #999 from achamely/master

Clean up extra character
ensure we use restrictive, not greedy regex for matching
Merge pull request #1001 from faizkhan00/critfix

ensure we use restrictive, not greedy regex for matching
Merge pull request #5 from mastercoin-MSC/master

Merged