Jon
Det senaste från editor. Ofungerande, men men
Merge branch 'master' of https://github.com/PutBoy/project-dungeon-crawl

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/build-editor-dungeon-crawl-Desktop_Qt_5_0_2_MinGW_32bit-Debug/ui_mainwindow.h