Merge remote-tracking branch 'origin/devel' into devel
ldspider-trunk.jar added
Merge branch 'devel' of https://github.com/researchstudio-sat/webofneeds into devel