Symfony2Installer
Merge remote-tracking branch 'origin/master'

Conflicts:
	Installer.php