Merge branch '2.5' into 2.6

* 2.5:
  [Tests] Ignored the Resources and Tests directories for the new AppBundle

Author: fabpot

app/phpunit.xml.dist

@@ -25,6 +25,8 @@
         <whitelist>
             <directory>../src</directory>
             <exclude>
+                <directory>../src/*Bundle/Resources</directory>
+                <directory>../src/*Bundle/Tests</directory>
                 <directory>../src/*/*Bundle/Resources</directory>
                 <directory>../src/*/*Bundle/Tests</directory>
                 <directory>../src/*/Bundle/*Bundle/Resources</directory>