Fixed various rebase-conflicts.
Conflicts:
	app/models/query.rb