bugfixes
Merge branch 'master' of https://github.com/barta3/smojeRestPlatform.git