Merge branch 'master' of github.com:mastercoin-MSC/omniwallet into fix-641

Conflicts:
	api/tx_generate_service.py
	www/partials/explorer_assets.html