fix tests for 2.3 and add support for multiple fields
Merge pull request #50 from dereuromark/develop

fix tests for 2.3 and add support for multiple fields
closes #51 - resolve issue with merging data with string keys like 'or' in query filter.
Merge branch 'develop' of github.com:CakeDC/search into develop

Conflicts:
	Model/Behavior/SearchableBehavior.php
Remove obsolete method usage of 'am'. Replace it with array_merge
adding missing doc block
Merge pull request #52 from dereuromark/develop

adding missing doc block
Fix missing comma in composer.json
strict comparison for strings and some cleanup
Merge pull request #55 from dereuromark/develop

strict comparison for strings and some cleanup
Merge pull request #54 from majna/patch-1

Fix missing comma in composer.json
fixes reset/unset params issue
move filterEmpty to after the merge to assert empty fields will actually reset after post
test cases added
Merge pull request #57 from dereuromark/develop

fixes reset/unset params issue
estrict warnings fixed for SearchableBehaviorTest
Merge pull request #58 from dereuromark/develop

estrict warnings fixed for SearchableBehaviorTest
fix querystring search
Merge pull request #59 from dereuromark/develop

fix querystring search
reduce complexity/depth of presetForm and add isSearch variable to check if the current request is a filtered search