EEGLAB version from NBT
fixed conflicts from merge