Front-end
fixed full quantities
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Nfq/NomNomBundle/Resources/views/Event/event.html.twig
	src/Nfq/NomNomBundle/Resources/views/Event/eventphaseone.html.twig
	src/Nfq/NomNomBundle/Resources/views/Event/eventphasetwo.html.twig