Commiting to master

There should be 4226 files that the GUI will upload.