Commit to pull.
Merge branch 'master' of https://github.com/schiem/roguelike

Conflicts:
	src/gui/gui_event.cpp
	src/misc_classes/helper.cpp
	src/misc_classes/helper.h