photo
Merge branch 'master' of https://github.com/BewBa/Opt2

Conflicts:
	src/FrontOffice/OptimusBundle/Resources/views/Photo/new.html.twig