Route name and parameters option added
Conflicts:
	Model/ModelManager.php
Some text left behind removed
Merge remote-tracking branch 'sonata/master'
documentation for custom route added
documentation for custom route updated
documentation for custom route: code indentation fixed
Update defining_entities.rst

[Doctrine\Common\Annotations\AnnotationException]                                                                                                  
  [Type Error] Attribute "length" of @ORM\Column declared on property Tutorial\BlogBundle\Entity\Post::$title expects a(n) integer, but got string.
Typo TagAdmin / CommentAdmin

There is a little typo TagAdmin => CommentAdmin (in the "Tweak the CommentAdmin class" section)
Fixed typo on a comment
Migrate code to use the BlockContext
Merge pull request #207 from kasifi/patch-2

Typo TagAdmin / CommentAdmin
Merge pull request #206 from kasifi/patch-1

Update defining_entities.rst : expects a(n) integer, but got string
Update composer.json
Update composer.json
Merge pull request #217 from simonchrz/master

removed unused dependency on knplabs/knp-menu-bundle
Merge pull request #212 from ClementGautier/patch-1

Fixed typo on a comment
Update form_field_definition.rst

Fixed outdated documentation
Merge pull request #218 from Zertz/patch-1

Update form_field_definition.rst
Add a 'required' class to table headers

See https://github.com/sonata-project/SonataAdminBundle/pull/1369