add Core/Service tests and clean some other
resolve conflicts with merge
resolve conflicts after merge upstream XOOPS
add tests for Core/Service + Cleanup
Merge pull request #130 from alain91/master

Clean conflicts after merging XOOPS Core master