Fixes contentsearch (#issue 276)
Updated CHANGES
Simplify test
Updated text during test
Test for contentsearch in just one place
Remove socket timeouts and use right configuration to annotate

Conflicts:

	.travis.yml
Merge branch 'master' into issue_276

Conflicts:
	docs/CHANGES.rst
Merge branch 'master' into issue_276
Fixed some tests to work with partial load of content via AJAX
Updated CHANGES
Merge branch 'issue_276' of https://github.com/collective/collective.cover into issue_276
Minor change in test
Update robot_contentchooser_search_tab.txt
Update robot_contentchooser_search_tab.txt
Refactor content chooser test to use new Robot Framework stuff

Test not passing; see issue #285
Refactor Robot Framework test for collection tile
Remove keyword.txt to avoid conflicts with new version of plone.app.robotframework (refs. #286)
Merge pull request #280 from collective/issue_276

closes #276