Change Skud-service for json response
Merge remote-tracking branch 'origin/master'