fixed problem with high cpu usage in sync server.
Merge branch 'master' of https://github.com/getshop/FrontEnd