My Changes
Merge remote-tracking branch 'origin/TestBranch' into TestBranch

Conflicts:
	Astar/src/GUI/FileTransferStatusPage.java