updated to Symfony 2.6, includes some minor additions and simplifications
Merge pull request #2080 from Guite/1.4

updated to Symfony 2.6, includes some minor additions and simplifications