fix serialization issues
Merge HEAD, branch 'master' of github.com:AlexOreshkevich/ExpertWeb