Merge branch 'master' into server
Made some modifications to database and started executing client commands
fixed merge conflicts