Add new log game module
fixed merge issues
fix more merge issues
Merge branch 'develop' into venus