Guihelp update
Updated buttons
Merge branch 'master' into Anton

Conflicts:
	grief/grief/map.txt