Add missing dependency to Query
Merge branch 'release/4.0' into dev

Conflicts:
	app/assets/javascripts/angular/work_packages/controllers/work-packages-list-controller.js