Add GENDER support to visualeditor-editconflict

Change-Id: I3257d56107772c26a41e0b2bfcc71509cd1c9284
Merge "Add GENDER support to visualeditor-editconflict"