Merge branch 'hotfix/1.2.17' master v1.2.17
-rw-r--r-- 38 .bowerrc
-rw-r--r-- 63 .gitignore
-rw-r--r-- 9157 .htaccess
-rw-r--r-- 257 GLM_site_check.phtml
-rw-r--r-- 1742 Gruntfile.js
-rw-r--r-- 747 README.md
drwxr-xr-x - Toolkit
drwxr-xr-x - admin
drwxr-xr-x - assets
-rw-r--r-- 111 bower.json
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-- 238 humans.txt
drwxr-xr-x - images
-rw-r--r-- 4345 index.php
drwxr-xr-x - js
drwxr-xr-x - libjs
-rw-r--r-- 353 package.json
-rw-r--r-- 1730 package.php
drwxr-xr-x - photoswipe
-rw-r--r-- 106 robots.txt
drwxr-xr-x - scss
-rw-r--r-- 38352 setup.phtml
-rw-r--r-- 38222 setup_functions.phtml
drwxr-xr-x - static
-rwxr-xr-x 19665 styles.css
-rw-r--r-- 8644 template.html
drwxr-xr-x - templates
-rwxr-xr-x 6668 webTemplate.html