New Client
Updated client files
Merge branch 'client'