CS: unify datatypes in docblock comments
type hint UrlGeneratorInterface instead of Router
Merge branch '1.0'

Conflicts:
	Event/VideoCreatedEvent.php
	Form/Extension/VideoUploaderExtension.php