codegen rerun
Merge branch 'run-codegen'

Conflicts:
	server/plugins/botnet/objects.py
updated ruskipython to reflect pythonclient changes