no-stop-on-error option added to populate command
Populate command: use isInteractive() instead of option
Add RAM (current & peak) in populate evolution information
fixes ignore_missing option and unknown index
Avoid index reset error in case of unexistant index
Merge remote-tracking branch 'upstream/master'
New method getMemoryUsage to get RAM information message
Force slash at the end of the url parameter
added support for setting search options
added query string to collector and updated tests
Keep all special mapping fields for types when resetting a single type. Field list is according to the current documentation of elasticsearch 0.90
Keep dynamic templates
handle _parent separately
Add ability to specify server timeout
fixed phpdoc
Merge pull request #468 from FriendsOfSymfony/fix-reset-index-type

Keep all special mapping fields for types when resetting a single type. ...
Merge remote-tracking branch 'PeerJ/AddServerTimeout'

Conflicts:
	DependencyInjection/Configuration.php
Merge pull request #462 from oohnoitz/master

added support for setting search options
Merge pull request #461 from tgallice/url_parameter

Force slash at the end of the url parameter
Merge pull request #458 from digitalkaoz/patch-1

fixes ignore_missing option and unknown index