Merge origin/master

Conflicts:
	.gitignore
	LICENSE
	README.md
	UPGRADE-2.2.md
	UPGRADE.md
	app/.htaccess
	app/AppCache.php
	app/AppKernel.php
	app/Resources/views/base.html.twig
	app/SymfonyRequirements.php
	app/autoload.php
	app/bootstrap.php.cache
	app/check.php
	app/config/config.yml
	app/config/config_dev.yml
	app/config/config_prod.yml
	app/config/config_test.yml
	app/config/parameters.yml
	app/config/parameters.yml.dist
	app/config/routing.yml
	app/config/routing_dev.yml
	app/config/security.yml
	app/console
	app/phpunit.xml.dist
	bin/doctrine
	bin/doctrine.bat
	bin/doctrine.php
	bin/doctrine.php.bat
	composer.json
	composer.lock
	nbproject/project.properties
	nbproject/project.xml
	src/.htaccess
	src/Acme/DemoBundle/AcmeDemoBundle.php
	src/Acme/DemoBundle/Controller/DemoController.php
	src/Acme/DemoBundle/Controller/SecuredController.php
	src/Acme/DemoBundle/Controller/WelcomeController.php
	src/Acme/DemoBundle/DependencyInjection/AcmeDemoExtension.php
	src/Acme/DemoBundle/EventListener/ControllerListener.php
	src/Acme/DemoBundle/Form/ContactType.php
	src/Acme/DemoBundle/Resources/config/routing.yml
	src/Acme/DemoBundle/Resources/config/services.xml
	src/Acme/DemoBundle/Resources/public/css/demo.css
	src/Acme/DemoBundle/Resources/public/images/blue-arrow.png
	src/Acme/DemoBundle/Resources/public/images/field-background.gif
	src/Acme/DemoBundle/Resources/public/images/logo.gif
	src/Acme/DemoBundle/Resources/public/images/search.png
	src/Acme/DemoBundle/Resources/public/images/welcome-configure.gif
	src/Acme/DemoBundle/Resources/public/images/welcome-demo.gif
	src/Acme/DemoBundle/Resources/public/images/welcome-quick-tour.gif
	src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig
	src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig
	src/Acme/DemoBundle/Resources/views/Demo/index.html.twig
	src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig
	src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig
	src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig
	src/Acme/DemoBundle/Resources/views/Secured/login.html.twig
	src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig
	src/Acme/DemoBundle/Resources/views/layout.html.twig
	src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php
	src/Acme/DemoBundle/Twig/Extension/DemoExtension.php
	src/wte/FrontBundle/Controller/DefaultController.php
	src/wte/FrontBundle/DependencyInjection/Configuration.php
	src/wte/FrontBundle/DependencyInjection/wteFrontExtension.php
	src/wte/FrontBundle/Resources/config/routing.yml
	src/wte/FrontBundle/Resources/config/services.yml
	src/wte/FrontBundle/Resources/doc/index.rst
	src/wte/FrontBundle/Resources/translations/messages.fr.xlf
	src/wte/FrontBundle/Resources/views/Default/index.html.twig
	src/wte/FrontBundle/Tests/Controller/DefaultControllerTest.php
	src/wte/FrontBundle/wteFrontBundle.php
	web/.htaccess
	web/app.php
	web/app_dev.php
	web/apple-touch-icon.png
	web/config.php
	web/favicon.ico
	web/robots.txt