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

Conflicts:
	grief/grief/Display.cpp
added guihelp
Merge branch 'Sebastian'

Conflicts:
	grief/grief/grief.vcxproj.filters