[#2304] Finding another bad {% render syntax in 2.1
Merge pull request #2308 from WouterJ/patch-20

Updated link to correct twig docs
Merge branch '2.0' into 2.1

Conflicts:
	cookbook/doctrine/event_listeners_subscribers.rst
Merge branch '2.1' into 2.2

Conflicts:
	book/http_cache.rst
	book/templating.rst
Merge pull request #2309 from pvolok/fix_domcrawler_example

Fix DomCrawler html dumping example.
Add note about buffering in StreamedResponse.
[#2308] Reverting commit as 2.1 uses Twig 1.12, which uses the new way of doing extensions
Merge branch '2.1' into 2.2
Merge branch '2.2'
Merge pull request #2311 from caponica/fix_url_plurals

Fixed plural version of URLs where it was referred to as "URL's"
Merge pull request #2313 from Aitboudad/2.0

[Config][Normalization] added a tip about altered keys
Merge pull request #2314 from hpatoio/2.0

Fixed a yaml configuration block
Merge pull request #2315 from richardmiller/removing_use_statement

Removing an unused use statement from example
Merge pull request #2316 from richardmiller/adding_parent_service_note

Adding a tip to the parent services definition page
[#2316] Tweaking wording
Merge pull request #2317 from richardmiller/fixing_parent_service_examples

Removing class key/attribute from parents services in examples
Merge pull request #2318 from richardmiller/adding_note_on_service_manipulation

Adding a note about only being able to manipulate service definitions be...
[#2318] Adding a period
Update doctrine.rst

Variable name should be in plural form for collection
Merge pull request #2365 from matthiasnoback/patch-1

Removed comment about Java