doxy comments
Merge branch 'clientbranch'