new changes to guihelp and display
Merge branch 'master' into Anton

Conflicts:
	grief/grief/main.cpp
	grief/grief/map.txt
yesbox