Fix the crash on the advanced options menu.
fix the unit coloration issue regarding custom weapons.
unneccesary.
plug memory hole.
Merge remote-tracking branch 'upstream/master' into Tervees
Reverting OpenXcom.rc

This shouldn't have been committed in the first place...