full client rebase of the project
Merge branch 'master' of https://github.com/ucbl/DataConf