Merge branch 'hotfix/1.2.10'
-rw-r--r-- 46 .gitignore
-rw-r--r-- 1694 Gruntfile.js
drwxr-xr-x - assets
-rw-r--r-- 111 bower.json
drwxr-xr-x - css
-rw-r--r-- 1150 favicon.ico
-rwxr-xr-x 3237 footer.php
-rwxr-xr-x 964 front-page.php
-rwxr-xr-x 7174 functions.php
-rw-r--r-- 4245 glm-blocks.php
-rwxr-xr-x 3201 header.php
-rw-r--r-- 3732 home.php
-rwxr-xr-x 13856 index.html
-rwxr-xr-x 629 index.php
-rwxr-xr-x 15706 interior.html
drwxr-xr-x - js
drwxr-xr-x - library
drwxr-xr-x - nggallery
-rw-r--r-- 432 package.json
-rwxr-xr-x 1296 page.php
-rwxr-xr-x 1885672 screenshot.png
drwxr-xr-x - scss
-rw-r--r-- 2294 search.php
-rwxr-xr-x 1968 sidebar.php
-rw-r--r-- 5252 single.php
-rwxr-xr-x 158 style.css
-rw-r--r-- 6434 test.php
-rw-r--r-- 15048 test2.php