removing unneeded queries
Merge branch 'master' into development-pre-4.0

Conflicts:
	modules/tasks/vw_tasks.php