Merge pull request #2372 from jakub-/queryplan

QueryPlan refactorings
Show CSV files in example. Fixed duplicate entry.
Allow Ronja to handle WITH