Fixed typo
Removed new verision added section
[#2418] Simplifying static page note
Merge pull request #2429 from joelclermont/typo-in-form-collections

Typo in form collections
Merge pull request #2436 from kevintweber/2.0

Issue #2378. Minor additions. Implemented suggestions by WouterJ.
[#2436] Removing router:match from 2.0 - will put back on 2.1
Merge branch '2.0' into 2.1

Conflicts:
	book/service_container.rst
	cookbook/map.rst.inc
	cookbook/routing/index.rst
[#2436] Putting back router:match changes
Merge pull request #2432 from afishnamedsquish/collection_constraint_optional_required_docs

Validator Documentation for Collection constraint Required/Optional options
[#2432] Tweaking language around Required constraint
Merge branch 'yml-rendering' of github.com:lucascourot/symfony-docs into lucascourot-yml-rendering

Conflicts:
	components/dependency_injection/parentservices.rst
Merge pull request #2438 from iamdto/ticket_2347

[#2347] Added missing 'kernel.fragment_renderer' DIC tag
Merge branch '2.0' into 2.1

Conflicts:
	cookbook/configuration/pdo_session_storage.rst
Merge branch '2.1' into 2.2
Merge remote-tracking branch 'origin/2.2' into 2.2
[#2438] Minor additions to the kernel.fragment_renderer tag reference
Merge pull request #2441 from franmomu/use_property_accessor_instead_property_path

[Cookbook] Remove deprectated call to PropertyPath
Merge pull request #2443 from WouterJ/facelift_propel

[#2381] Facelifted book/propel
Merge branch '2.0' into 2.1

Conflicts:
	book/propel.rst
Merge pull request #2444 from WouterJ/doctrine_add_note

Moved text into a note in book/doctrine