Fixed glitch with overlay in the tree
Merge branch 'ryland' into micah
Fixed tree glitch in test map
Merge branch 'ryland' into micah

Conflicts:
	maps/test-2.tmx