updated guihelp and display
Merge remote-tracking branch 'origin' into Anton

Conflicts:
	grief/grief/Display.cpp
added guihelp