Prepare for merge
Merge branch 'master' of github.com:BlackToppStudios/DAGFrameScheduler

Conflicts:
	src/dagframescheduler.h
	src/doublebufferedresource.h
	src/rollingaverage.h