Re-added paho
Merge branch 'client' into development