Merge branch 'release/4.2.0' master v4.2.0
-rw-r--r-- 103 .gitignore
drwxr-xr-x - .settings
-rwxr-xr-x 8564 activate.php
drwxr-xr-x - assets
drwxr-xr-x - classes
drwxr-xr-x - css
-rwxr-xr-x 1293 deactivate.php
-rwxr-xr-x 5805 defines.php
-rwxr-xr-x 15626 index.php
drwxr-xr-x - js
drwxr-xr-x - lib
drwxr-xr-x - misc
drwxr-xr-x - models
-rwxr-xr-x 4144 readme.txt
drwxr-xr-x - setup
-rw-r--r-- 784 uninstall.php
drwxr-xr-x - views