Merge remote-tracking branch 'origin/reorder_tasks'

Conflicts:
	wsgi/static/ubo/js/ubo_tasks.js