fixed CS
Merge branch '1.2'

* 1.2:
  fixed some tests
  fixed CS
  simplified the build matrix
  fixed tests for Symfony 2.6+
  allowed any Symfony 2.x versions
  Grammar correction

Conflicts:
	composer.json
	tests/Silex/Tests/Application/UrlGeneratorTraitTest.php
	tests/Silex/Tests/Provider/ValidatorServiceProviderTest.php