Update jars
Update jars
Update jars
Update jars
FIX: Building issues
FIX: Remove client
Update jars
Merge branch 'master' into production