Fixed callback problems
Merge branch 'master' of github.com:palantus/serverplatform