Merge branch 'client-server' into develop
Merge branch 'develop' of github.com:dymk/diqs into client-server