Game ID for BGEE
Merge branch 'devel' into devel-ci

Conflicts:
    src/infinity/resource/ResourceFactory.java
Keep BGEE on BG2's effect code for now
Merge branch 'devel' into devel-ci