Doxygen documentation
Merge branch 'clientbranch'