Added a symfony base
Merge conflict in mockup resolved