Merge branch '1.0' into 1.1

Conflicts:
	Doctrine/Phpcr/NonTranslatableMetadataListener.php
	Templating/Helper/CmfHelper.php

Author: wouterj

.travis.yml

@@ -7,8 +7,15 @@ php:
 
 env:
   - 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 self-update
@@ -19,7 +26,3 @@ script: phpunit --coverage-text
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
   email: "symfony-cmf-devs@googlegroups.com"
-
-matrix:
-  allow_failures:
-    - env: SYMFONY_VERSION=dev-master