updating ui and eeg_imaging
merging from master