Fixed doc strings and typo.

Conflicts:
	lib/FSi/Component/DataSource/Driver/Collection/CollectionAbstractField.php
	lib/FSi/Component/DataSource/Extension/Symfony/Form/Field/FormFieldExtension.php