transposed cid / uid
Merge branch 'master' of github.com:svmehta/live-git