Gui Test
Master Comment
Merge master into gui_branch

Conflicts:
	src/webdictionary/WebDictionary.java
Merge master into gui_panel
Merge gui_branch into gui_panel