moved client until later to fix linking problems #983
Merge branch 'merge-libs' into merge-libs-master