Work on module system for GUIs
Current GUIs now extend master ED GUI class
Merge branch 'master' into 16