merge with dev

diff --cc account/accounts.go
Simple merge

diff --cc api/api.go
Simple merge

diff --cc api/query.go
Simple merge

diff --cc asset/asset.go
index 1696642,cd370b8..e8cdbcb
--- 1/asset/asset.go
--- 2/asset/asset.go
+++ b/asset/asset.go
@@@ -272,10 -282,33 +272,33 @@@ func (reg *Registry) GetAliasByID(id st
        return *asset.Alias
  }
  
+ // GetAsset get asset by assetID
+ func (reg *Registry) GetAsset(id string) (*Asset, error) {
+       asset := &Asset{}
+ 
+       if strings.Compare(id, DefaultNativeAsset.AssetID.String()) == 0 {
+               return DefaultNativeAsset, nil
+       }
+ 
+       if interAsset := reg.db.Get([]byte(assetPrefix + id)); interAsset != nil {
+               if err := json.Unmarshal(interAsset, asset); err != nil {
+                       return nil, err
+               }
+               return asset, nil
+       }
+ 
+       if extAsset := reg.db.Get([]byte(ExternalAssetPrefix + id)); extAsset != nil {
+               if err := json.Unmarshal(extAsset, asset); err != nil {
+                       return nil, err
+               }
+       }
+       return asset, nil
+ }
+ 
  // ListAssets returns the accounts in the db
- func (reg *Registry) ListAssets(id string) ([]*Asset, error) {
+ func (reg *Registry) ListAssets() ([]*Asset, error) {
        assets := []*Asset{DefaultNativeAsset}
 -      assetIter := reg.db.IteratorPrefix([]byte(assetPrefix))
 +      assetIter := reg.db.IteratorPrefix(assetPrefix)
        defer assetIter.Release()
  
        for assetIter.Next() {