Last uncommited changes for jskollz-server

Signed-off-by: Jean-Matthieu BARBIER <jm.barbier@solidev.net>