a special branch with commits 

I've tried to make a special branch with modifications from Xoops/XoopsCore

The intermediate commits concern the resolution of conflicts.