Fixed composer.json conflicts and upgraded to Symfony 2.2 (had to modify a few {{ render }} tags in twig to be compatible) #40