Symfony2 install
Symfony2 install
Merge remote-tracking branch 'origin/NotPrometey' into NotPrometey

Conflicts:
	.idea/encodings.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
Symfony2 install