updated due to changes in Symfony2
updated generators due to changes in Symfony 2.3