Merge branch 'hotfix/1.1.7'
-rw-r--r-- 484 README.md
drwxr-xr-x - controllers
drwxr-xr-x - css
drwxr-xr-x - fonts
-rw-r--r-- 1676 index.php
drwxr-xr-x - js
drwxr-xr-x - lib
drwxr-xr-x - models
-rw-r--r-- 280 readme.txt
drwxr-xr-x - views