Master Comment
Merge master into gui_branch

Conflicts:
	src/webdictionary/WebDictionary.java