init
Merge branch 'master' of https://github.com/symfony/symfony into offical

Conflicts:
	.gitignore
	LICENSE
	README.md
	UPGRADE-2.2.md
	UPGRADE-2.3.md
	UPGRADE-2.4.md
	composer.json
delete log