Merge branch '2.0' of github.com:hansallis/symfony-docs into hansallis-2.0

Conflicts:
	reference/forms/types/collection.rst

Author: weaverryan

reference/forms/types/collection.rst

@@ -22,6 +22,7 @@ forms, which is useful when creating forms that expose one-to-many relationships
 | Inherited   | - `label`_                                                                  |
 | options     | - `error_bubbling`_                                                         |
 |             | - `by_reference`_                                                           |
+|             | - `empty_data`_                                                             |
 +-------------+-----------------------------------------------------------------------------+
 | Parent type | :doc:`form</reference/forms/types/form>`                                    |
 +-------------+-----------------------------------------------------------------------------+
@@ -331,3 +332,5 @@ error_bubbling
 .. _reference-form-types-by-reference:
 
 .. include:: /reference/forms/types/options/by_reference.rst.inc
+
+.. include:: /reference/forms/types/options/empty_data.rst.inc