Client Invoices
Merge origin/etkeztetes into etkeztetes
Client Invoices
Merge origin/etkeztetes into etkeztetes

Conflicts:
	src/JCSGYK/AdminBundle/Resources/public/js/jcscatering.coffee
Invoice payments