Merge branch 'hotfix/1.2.3'
-rw-r--r-- 471 .gitignore
-rw-r--r-- 6058 .htaccess
-rw-r--r-- 2226 Registry.php
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 - images
drwxr-xr-x - img
-rw-r--r-- 4229 index.php
drwxr-xr-x - js
drwxr-xr-x - libjs
drwxr-xr-x - photoswipe
-rw-r--r-- 32 robots.txt
-rw-r--r-- 38468 setup.phtml
-rw-r--r-- 38222 setup_functions.phtml
drwxr-xr-x - static
-rwxr-xr-x 10979 styles.css
drwxr-xr-x - templates
drwxr-xr-x - userArea
-rwxr-xr-x 8550 webTemplate.html