Merge pull request #14 from Pardot/bigdata-happyland

[PDT-4755] Add option to client side filter
Merge remote-tracking branch 'origin/master' into bigdata-happyland