fix phpcs ant target
fix phpunit ant target to use vendor
Merge pull request #209 from bendavies/psr2-build

PSR2 build
fixes #214, returning nested debug-information
Merge commit '0939d724ea4272d8d64cbf79035ec3d2021997ed' into develop for PR #217

Conflicts:
	library/Solarium/QueryType/Select/Result/Debug/Detail.php
	tests/Solarium/Tests/QueryType/Select/Result/Debug/DetailTest.php
Merge branch 'develop' of github.com:basdenooijer/solarium into develop
Add fixture loading capabilities
Merge pull request #221 from baldurrensch/fixtures

Add fixture loading capabilities
Filter by default in documents

Filter control characters in update documents by default
This fixes #220
Fixed the fixture laoder not having an executor
Merge pull request #223 from baldurrensch/fixture_loader_fix

Fixed the fixture loader not having an executor
Merge pull request #222 from baldurrensch/filter_default

Filter by default in documents
Fix issue #230
Fix issue #231
Update the test case
Merge branch 'fix-pivot-extra-params' of github.com:FredM/solarium into develop

Conflicts:
	tests/Solarium/Tests/QueryType/Select/RequestBuilder/Component/FacetSetTest.php
Merge branch 'develop' of github.com:basdenooijer/solarium into develop
Merge branch 'fix-pivot-extra-params' of github.com:FredM/solarium into develop

Conflicts:
	tests/Solarium/Tests/QueryType/Select/RequestBuilder/Component/FacetSetTest.php
Merge branch 'fix-range-mincount' of github.com:FredM/solarium (PR #238) into develop

Conflicts:
	tests/Solarium/Tests/QueryType/Select/RequestBuilder/Component/FacetSetTest.php
Fixed merge error