Merge Symfony 1.4 project + Propel