Adds Symfony2 files.
Resolve conflicts.