and a final resolution back to dev...

merge from dev (new ops), fix beekeep compile

Conflicts:
	apps/bees/src/op_derived.h
	apps/bees/src/ops/op_hid_word.c
	utils/beekeep/Makefile
	utils/beekeep/src/net_py.c