Merge branch 'hotfix/1.0.14'
-rw-r--r-- 8271 .htaccess
drwxr-xr-x - Toolkit
drwxr-xr-x - admin
drwxr-xr-x - assets
drwxr-xr-x - cache
drwxr-xr-x - classes
-rw-r--r-- 7201 combine.php
drwxr-xr-x - config
drwxr-xr-x - css
drwxr-xr-x - fancybox
drwxr-xr-x - images
-rw-r--r-- 4229 index.php
drwxr-xr-x - js
drwxr-xr-x - libjs
drwxr-xr-x - photoswipe
-rw-r--r-- 38618 setup.phtml
-rw-r--r-- 38222 setup_functions.phtml
drwxr-xr-x - static
-rw-r--r-- 32930 styles.css
drwxr-xr-x - templates
-rw-r--r-- 11533 webTemplate.html