merge dev
merge

Conflicts:
	apps/bees/src/ops/op_life.c