Update deprecated variable call of google map
don't access undefined variable
add productsData with subroot for products list items
Changed styling for lists, like FAQ in prilhofer-web
revert ae32605e7fad97e2c909f196ff4a206e6c456291

(leave config.ini change)

this change is done in master now
numberfield in backend now is input type=text

client side validation of chrome wasn't compatible
add comment
ignore component that isn't configured in category generator

this fixes errors when multiple category generators with different components exist
Merge branch '3.3' into 3.4

Conflicts:
	Kwc/Root/Category/Generator.php
fix debug.componentCache.clearOnClearCache config setting

on production we don't want to clear the view cache on every clear-cache, we have clear-view-cache for that

zudummm zum zum zum
Merge branch '3.3' into 3.4
trl xml

Conflicts:
	trl.xml
on cli output exceptions but don't disable logging

this makes logOrThrow not throw the exception on production server but still output it so it
can be seen in cron-job output
increase memory limit for clear-view-cache

required when deleting more than 100000 entries
fix imagick usage for imagemagick>7.7

fixes too light images on debian wheezy
fix imagick usage for older versions where setColorspace doesn't exist yet
fix Image scale
disable test which doesn't work correctly in updated firefox

problem is the focus in the iframe
Merge branch '2.0' into 2.1

Conflicts:
	Vps_js/Form/GoogleMapWindow.js
Merge remote-tracking branch 'origin/2.1' into 3.0

Conflicts:
	config.ini
	tests/Kwc/Basic/TextSessionModel/SeleniumTest.php
	tests/Vpc/Basic/TextSessionModel/SeleniumTest.php
	tests/Vpc/Basic/TextSessionModel/SeleniumTestDisabled.php