more comments
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/gui/UploadToExistingExpPanel.java