Merge branch 'tile_editor' of https://github.com/serengeor/And-they-shall-know-no-fear into tile_editor

Conflicts:
	Sources/editor.cpp
Merge branch 'tile_editor' of https://github.com/serengeor/And-they-shall-know-no-fear into tile_editor

Conflicts:
	Sources/editor.cpp