WIP
Merge branch 'master' of https://github.com/CodeYellowBV/sync
client stuff