initial commit with symfony 2 project
merge conflicts resolved