Merge branch 'hotfix/1.1.14' master v1.1.14
-rw-r--r-- 386 .gitignore
-rw-r--r-- 6032 .htaccess
drwxr-xr-x - Toolkit
drwxr-xr-x - admin
-rw-r--r-- 35463 apple-touch-icon.png
drwxr-xr-x - assets
drwxr-xr-x - classes
-rw-r--r-- 7201 combine.php
drwxr-xr-x - config
drwxr-xr-x - css
drwxr-xr-x - images
-rw-r--r-- 5354 index.php
drwxr-xr-x - libjs
drwxr-xr-x - photoswipe
-rw-r--r-- 41462 priceQuoteForm.inc
-rw-r--r-- 38884 setup.phtml
-rw-r--r-- 38222 setup_functions.phtml
drwxr-xr-x - static
-rw-r--r-- 11830 styles.css
drwxr-xr-x - templates
-rw-r--r-- 8122 webTemplate.html