Merge origin/master

Conflicts:
	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/profiler/index.csv
	src/Ynov/LabsBundle/Resources/config/routing.yml
Merge origin/master

Conflicts:
	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/profiler/index.csv
	src/Ynov/LabsBundle/Resources/config/routing.yml