Fix query error
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/M235/YourSub/SandwichBundle/Controller/SandwichController.php
	src/M235/YourSub/SandwichBundle/Entity/Sandwich.php
	src/M235/YourSub/SandwichBundle/Entity/SandwichRepository.php
	src/M235/YourSub/SandwichBundle/Form/SandwichType.php