Merge branch 'feature_game_activity_and_ai' into develop
Merge branch 'develop' into feature_game_activity_and_ai