merge error corrected (retrieving filterConditions was broken)
Merge pull request #66 from IDgis/merge-error-fix

merge error corrected (retrieving filterConditions was broken)