Merge branch 'hotfix/1.1.2'
-rw-r--r-- 41 .gitignore
-rw-r--r-- 1694 Gruntfile.js
drwxr-xr-x - assets
-rw-r--r-- 111 bower.json
drwxr-xr-x - bower_components
drwxr-xr-x - css
-rwxr-xr-x 1584 footer.php
-rwxr-xr-x 1267 front-page.php
-rwxr-xr-x 5598 functions.php
-rwxr-xr-x 2579 header.php
-rw-r--r-- 3773 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-- 459 package.json
-rwxr-xr-x 1316 page.php
-rwxr-xr-x 839385 screenshot.png
drwxr-xr-x - scss
-rw-r--r-- 2328 search.php
-rwxr-xr-x 254 sidebar.php
-rw-r--r-- 5293 single.php
-rwxr-xr-x 168 style.css
-rw-r--r-- 6433 test.php
-rw-r--r-- 15048 test2.php