Merge branch 'smarttoken-pricing' of github.com:Nevtep/omniwallet
Merge branch 'master' of https://github.com/mastercoin-MSC/omniwallet

Conflicts:
	www/js/service.js
Merge branch 'master' of https://github.com/mastercoin-MSC/omniwallet
Remove valuations from the client
Merge branch 'coinvaluation-refactor' of https://github.com/Nevtep/omniwallet into Display-Labels

Conflicts:
	www/js/service.js