Ändringar
mend
Merge branch 'jon'

Conflicts:
	editor-dungeon-crawl/build-editor-dungeon-crawl-Desktop_Qt_5_0_2_MinGW_32bit-Debug/Makefile
	editor-dungeon-crawl/build-editor-dungeon-crawl-Desktop_Qt_5_0_2_MinGW_32bit-Debug/Makefile.Debug
	editor-dungeon-crawl/build-editor-dungeon-crawl-Desktop_Qt_5_0_2_MinGW_32bit-Debug/Makefile.Release
	editor-dungeon-crawl/editor-dungeon-crawl/editor-dungeon-crawl.pro
	editor-dungeon-crawl/editor-dungeon-crawl/mainwindow.h
update