prepare upgrade to Symfony 2.5
Merge remote-tracking branch 'upstream/1.4' into 1.4
subsequent changes for upgrading to Symfony 1.5
autoloader fix
cleanup
Merge pull request #1871 from Guite/1.4

upgrade to Symfony 2.5