fixes
Merge branch 'Development' of github.com:ProjectStortSpel/Game into Development

Conflicts:
	Externals/content/scripting/storaspel/templates/tile.lua
orig
Merge branch 'Development' of github.com:ProjectStortSpel/Game into Development