Merge remote-tracking branch 'upstream/master'
tree464613742142d4a0e7ef0a2762951b057bba545a
-rw-r--r-- 6130 .gitignore
-rw-r--r-- 2135 README.md
drwxr-xr-x - htdocs
drwxr-xr-x - plugins
drwxr-xr-x - src