updated to include form for GUI
updated to include form for GUI
Merge master into moses2005_branch

Conflicts:
	EGSE_Client/src/moses/client/gui/MosesClientForm.java