initial upload of Symfony2 framework project
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore