Fix #379 with the clock, this infinite loop was due to concurrent access to the clock
Weather Service is disabled until a solution or a workaround is found for #377
Un gentil petit message de merge pour JR
Faite l'amerge, pas la guerre

Merge branch 'master' of https://github.com/appsgate2015/appsgate