Added clientData and merging on disconnnect
Merge branch 'master' of https://github.com/jojonas/SyncedMusic2014.git