Integrate the editor into the ICAT GUI

This is just for the show and tell today.
Merge remote-tracking branch 'origin/master'