Merge branch 'hotfix/1.0.17'
-rw-r--r-- 6052 .htaccess
drwxr-xr-x - Toolkit
drwxr-xr-x - admin
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 - fancybox
-rw-r--r-- 2041 fonts.css
drwxr-xr-x - fonts
drwxr-xr-x - images
drwxr-xr-x - img
-rw-r--r-- 4229 index.php
drwxr-xr-x - libjs
drwxr-xr-x - photoswipe
-rw-r--r-- 38155 setup.phtml
-rw-r--r-- 38222 setup_functions.phtml
drwxr-xr-x - static
-rw-r--r-- 10154 styles.css
-rwxr-xr-x 3283 superfish.css
drwxr-xr-x - templates
-rw-r--r-- 6643 webTemplate.html