Merge remote-tracking branch 'silexphp/master' into develop

Conflicts:
	composer.json
	src/controllers.php
	templates/404.html
	templates/404.html.twig
	templates/500.html
	templates/500.html.twig
	templates/errors/404.html
	templates/errors/500.html
	web/index_dev.php