Updated forest
Merge branch 'master' into interface_dev

Conflicts:
	resources/textures/tiles/forest.png