iss18-rest-api: incoperate fixes
iss18-rest-api: incoperate fixes

bepasty/bepasty-server,bepasty/bepasty-server,bepasty/bepasty-server,makefu/bepasty-server,makefu/bepasty-server,bepasty/bepasty-server,makefu/bepasty-server