Reformatted the entire src directory
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/gui/GUI.java
	src/gui/UploadTab.java
Reformatted the merges
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/gui/UploadToExistingExpPanel.java
Reformatted ExistingExpPanel