Block cleanup
Merge remote-tracking branch 'origin'

Conflicts:
	Scheduler/Controllers/BlocksController.cs