Merge branch 'fusionax' into account
-rw-r--r-- 34 .gitignore
-rw-r--r-- 42 .gitmodules
-rw-r--r-- 1516 AUTHORS
-rw-r--r-- 17992 COPYING
-rw-r--r-- 57402 ChangeLog
-rw-r--r-- 5494 Makefile
-rw-r--r-- 865 SECURITY
drwxr-xr-x - bin
drwxr-xr-x - classes
drwxr-xr-x - configs
m--------- - core
drwxr-xr-x - htdocs
drwxr-xr-x - include
drwxr-xr-x - modules
drwxr-xr-x - plugins
drwxr-xr-x - templates
drwxr-xr-x - upgrade