create and list fish
Merge branch 'feature-new_ffish' into develop

* feature-new_ffish:
  create and list fish