# fixes
Merge origin/master

Conflicts:
	src/DistribuceTisku/Bundle/Controller/CustomerController.php
	src/DistribuceTisku/Bundle/Controller/FormController.php
	src/DistribuceTisku/Bundle/Resources/views/Form/bookList.html.twig
	src/DistribuceTisku/Bundle/Resources/views/Form/customerlist.html.twig
	src/DistribuceTisku/Bundle/Resources/views/Form/subscriptionInterruptionList.html.twig
	src/DistribuceTisku/Bundle/Resources/views/Form/subscriptionList.html.twig
	src/DistribuceTisku/Bundle/Resources/views/Form/supplierList.html.twig
	src/DistribuceTisku/Bundle/Resources/views/Form/ubookList.html.twig
	src/DistribuceTisku/Bundle/Resources/views/Form/usubscriptionList.html.twig
# hurray its over