Fixed CHOC-79
Fixed bugs 67-71: Server validation done.
Merge branch 'master' of github.com:nromanen/Ch-023 into sdasktc_67_68_69_70_71