Replaced old version of GUI with new for testing
Replaced old with new
Merge branch 'master' of https://github.com/ultralaserdeluxe/gloria