Merge branch '1.1' into 1.2

Conflicts:
	README.md

Author: wouterj

.travis.yml

@@ -6,10 +6,16 @@ php:
     - 5.5
 
 env:
-  - SYMFONY_VERSION=2.2.*
   - SYMFONY_VERSION=2.3.*
-  - SYMFONY_VERSION=2.4.*
-  - SYMFONY_VERSION=dev-master
+
+matrix:
+  allow_failures:
+    - env: SYMFONY_VERSION=dev-master
+  include:
+    - php: 5.5
+      env: SYMFONY_VERSION=2.2.*
+    - php: 5.5
+      env: SYMFONY_VERSION=dev-master
 
 before_script:
   - composer require symfony/routing:${SYMFONY_VERSION} --prefer-source
@@ -19,7 +25,3 @@ script: phpunit --coverage-text
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
   email: "[email protected]"
-
-matrix:
-  allow_failures:
-    - env: SYMFONY_VERSION=dev-master