code clean up
Merge remote-tracking branch 'origin/developer-huan-2' into developer-lisa
Staging files for Game/Developer integration, clean up DatabaseDriver