Merge pull request #5 from mastercoin-MSC/master

Merged
issue 903
issue_903
issue 903
Merge branch 'master' of github.com:mastercoin-MSC/omniwallet into issue_903
issue_903
issue_903
issue_903
issue 903
issue 903
Merge branch 'master' of github.com:mastercoin-MSC/omniwallet into issue_903

Conflicts:
	www/js/WalletBuyAssetsController.js
Merge branch 'master' of github.com:mastercoin-MSC/omniwallet into issue_903
issue 903
Merge pull request #1030 from NadavSch/issue_903

Issue 903