Testing static context
Updating ServerClient with context
Fixed some things in server client and auth. Check yo nulls
Merging master with ServerClient