Corrected some merge-errors.

Conflicts:
	app/models/query.rb