[MONDRIAN-1770] Missed 2 added files with queryBuilder merge.
Merge pull request #178 from mkambol/qbMerge

[MONDRIAN-1770] Missed 2 added files with queryBuilder merge.