commit to change branch
Google test added for server
Merge remote-tracking branch 'origin/master' into Lag-vinna