implemented dvr clearing by refactoring queues to not be on the routing table
Merge branch 'master' into dvrclearingmerge

Conflicts:
	node.c