Feature/symfony 2.6