Update server version

will try to merge server and master version of straindb