Merge branch '1.3.x'

Conflicts:
	Resources/doc/index.rst
	Resources/doc/overriding_forms.rst

Author: XWB

Resources/doc/adding_invitation_registration.rst

@@ -203,7 +203,7 @@ Create the invitation field::
 Create the custom data transformer::
 
     <?php
-    // src/AppBundle/Form/InvitationToCodeTransformer.php
+    // src/AppBundle/Form/DataTransformer/InvitationToCodeTransformer.php
 
     namespace AppBundle\Form\DataTransformer;