added code to sync but only as comment, since ./run-server does core dump
Merge branch 'master' of https://github.com/rbellido/Project