Merge pull request #7 from mastercoin-MSC/master

Merged
Merge pull request #1 from mastercoin-MSC/master

Merged
Merge branch 'master' of https://github.com/nadavsch/omniwallet
Merge branch 'master' of https://github.com/nadavsch/omniwallet
Merge pull request #2 from mastercoin-MSC/master

Merged
Merge pull request #3 from mastercoin-MSC/master

Merged
Merge branch 'master' of https://github.com/nadavsch/omniwallet
issue 772 fixed
issue 772 fixed*
issue 772 fixed
issue_772_fixed*
Merge pull request #942 from NadavSch/issue_772_fixed

Issue 772 fixed
update js file locations
Fix merge conflict
Merge and sync with upstream