Merge branch...

Merge branch '222-distinguish-between-alternative-interaction-processes-and-competing-processes' into 'master'

Resolve "Distinguish between alternative interaction processes and competing processes"

Closes #222 and #162

See merge request !269