Changes from remote dev

Conflicts:
	app/AppKernel.php
	app/Resources/views/base.html.twig
	app/cache/.gitkeep
	app/cache/dev/annotations/Acme-DemoBundle-Controller-DemoController#contactAction.cache.php
	app/cache/dev/annotations/Acme-DemoBundle-Controller-DemoController#helloAction.cache.php
	app/cache/dev/annotations/Acme-DemoBundle-Controller-DemoController#indexAction.cache.php
	app/cache/dev/annotations/Acme-DemoBundle-Controller-DemoController.cache.php
	app/cache/dev/annotations/Acme-DemoBundle-Controller-SecuredController#helloAction.cache.php
	app/cache/dev/annotations/Acme-DemoBundle-Controller-SecuredController#helloadminAction.cache.php
	app/cache/dev/annotations/Acme-DemoBundle-Controller-SecuredController#loginAction.cache.php
	app/cache/dev/annotations/Acme-DemoBundle-Controller-SecuredController#logoutAction.cache.php
	app/cache/dev/annotations/Acme-DemoBundle-Controller-SecuredController#securityCheckAction.cache.php
	app/cache/dev/annotations/Acme-DemoBundle-Controller-SecuredController.cache.php
	app/cache/dev/annotations/Symfony-Bundle-FrameworkBundle-Controller-Controller#createForm.cache.php
	app/cache/dev/annotations/Symfony-Bundle-FrameworkBundle-Controller-Controller#createFormBuilder.cache.php
	app/cache/dev/annotations/Symfony-Bundle-FrameworkBundle-Controller-Controller#createNotFoundException.cache.php
	app/cache/dev/annotations/Symfony-Bundle-FrameworkBundle-Controller-Controller#forward.cache.php
	app/cache/dev/annotations/Symfony-Bundle-FrameworkBundle-Controller-Controller#generateUrl.cache.php
	app/cache/dev/annotations/Symfony-Bundle-FrameworkBundle-Controller-Controller#get.cache.php
	app/cache/dev/annotations/Symfony-Bundle-FrameworkBundle-Controller-Controller#getDoctrine.cache.php
	app/cache/dev/annotations/Symfony-Bundle-FrameworkBundle-Controller-Controller#getRequest.cache.php
	app/cache/dev/annotations/Symfony-Bundle-FrameworkBundle-Controller-Controller#getUser.cache.php
	app/cache/dev/annotations/Symfony-Bundle-FrameworkBundle-Controller-Controller#has.cache.php
	app/cache/dev/annotations/Symfony-Bundle-FrameworkBundle-Controller-Controller#redirect.cache.php
	app/cache/dev/annotations/Symfony-Bundle-FrameworkBundle-Controller-Controller#render.cache.php
	app/cache/dev/annotations/Symfony-Bundle-FrameworkBundle-Controller-Controller#renderView.cache.php
	app/cache/dev/annotations/Symfony-Bundle-FrameworkBundle-Controller-Controller#stream.cache.php
	app/cache/dev/annotations/Symfony-Component-DependencyInjection-ContainerAware#setContainer.cache.php
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevDebugProjectContainerCompiler.log
	app/cache/dev/appDevUrlGenerator.php
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/assetic/config/4/43a80f0e087752a2d4724591f85aa0e1.php
	app/cache/dev/assetic/routing.yml
	app/cache/dev/classes.map
	app/cache/dev/classes.php.meta
	app/cache/dev/profiler/index.csv
	app/config/config.yml
	app/config/config_dev.yml
	app/config/parameters.yml
	app/config/routing.yml
	app/logs/.gitkeep
	app/logs/dev.log
	composer.lock
	src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig
	vendor/autoload.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
	vendor/symfony/icu/Symfony/Component/Icu/IcuCurrencyBundle.php
	vendor/symfony/icu/Symfony/Component/Icu/IcuData.php
	vendor/symfony/icu/Symfony/Component/Icu/IcuLanguageBundle.php
	vendor/symfony/icu/Symfony/Component/Icu/IcuLocaleBundle.php
	vendor/symfony/icu/Symfony/Component/Icu/IcuRegionBundle.php
	vendor/symfony/icu/Symfony/Component/Icu/README.md
	vendor/symfony/icu/Symfony/Component/Icu/Tests/IcuIntegrationTest.php
	vendor/symfony/icu/Symfony/Component/Icu/composer.json
	web/.htaccess
	web/app_dev.php
	web/bundles/acmedemo
	web/bundles/framework
	web/bundles/sensiodistribution