Symfony2 installed
Merge branch 'master' of github.com:PeecSo/photo-management

Conflicts:
	.gitignore
	README.md