agregando archivos de phpstorm
actualizando version de symfony
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.json
	src/Acme/DemoBundle/Controller/DemoController.php
	src/Acme/DemoBundle/Twig/Extension/DemoExtension.php
	src/TESTBundle/Controller/DefaultController.php
	src/TESTBundle/Resources/config/routing.yml
	web/app.php
actualizando version de symfony