more fixing of merge conflicts
fixed drag & drop ish
Merge branch 'master' of github.com:raphgt2/eic-gui