* 1.3:
  Phpdocs
  Have `Controller::generateRouteName()` always put the method first.

Conflicts:
	src/Silex/ControllerCollection.php
	src/Silex/EventListener/LogListener.php
	src/Silex/ExceptionListenerWrapper.php
	src/Silex/Provider/SerializerServiceProvider.php
	tests/Silex/Tests/LazyUrlMatcherTest.php