Merge branch 'master' into jgrpp

# Conflicts:
#	src/company_cmd.cpp
#	src/lang/greek.txt
#	src/table/settings.ini

src/video/cocoa/cocoa_v.mm

@@ -196,6 +196,10 @@ bool VideoDriver_Cocoa::ToggleFullscreen(bool full_screen)
 
 	if ([ this->window respondsToSelector:@selector(toggleFullScreen:) ]) {
 		[ this->window performSelector:@selector(toggleFullScreen:) withObject:this->window ];
+
+		/* Hide the menu bar and the dock */
+		[ NSMenu setMenuBarVisible:!full_screen ];
+
 		this->UpdateVideoModes();
 		return true;
 	}