Fix regression with jQuery version
Update templates.rst

Duplicate opt
Merge pull request #1967 from Th3Mouk/patch-1

Update templates.rst
Merge branch 'sonata-project/master'

Conflicts:
	composer.json