Merge branch 'dev' into FSM

# Conflicts:
#	depends/packages/zeromq.mk
#	src/assetchains.json

src/fiat/iln

@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=ILN $1 $2 $3 $4 $5 $6

src/fiat/our

@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=OUR $1 $2 $3 $4 $5 $6