Consolidated code
Merge remote-tracking branch 'origin/master'

Conflicts:
	TimberWinR/Filters/DateFilter.cs
	TimberWinR/Filters/GrokFilter.cs