Platnosci Testowe do FO
Merge remote-tracking branch 'origin/master'

Conflicts:
	console/system/application/templates/plociuchy/product_add.html