server interface changes
Merge branch 'master' of github.com:knypolek/prir2013