INIT
Merge branch 'master' of https://github.com/Maksims/zm-server