updated guihelp
Merge branch 'master' into Anton

Conflicts:
	grief/grief/Display.cpp
	grief/grief/map.txt
Merge branch 'Sebastian'

Conflicts:
	grief/grief/map.txt