fixed the planet enums
Merge remote-tracking branch 'mainline/Computers' into COMP_ADD
fixed a JD comment
Merge branch 'COMP_ADD' into redis-refactor