Merge branch 'master' of C:\prv\chumpr with conflicts.
client integration 2