Fixed chmod on python scripts, still stuck on CMakeLists
resolve merge with Danying's bug fix
fixed final conflict
fixed bug where python service client and server got different default names