fix
fix merge issue
Merge branch 'feature/node-upgrade' into feature/new-Video-Modules

Conflicts:
	control/rdp.nodes/jmod.rdp.nodes.maxpat
	control/rdp.nodes/lib/jalg.rdp.nodes.maxpat
deleted conflicting copy
Merge branch 'feature/new-Video-Modules' into feature/node-upgrade