trees and stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	Thermo/assets/levels/tutorial_heat/Level_tutorial_heat.xml
	Thermo/assets/tutorial_heat.dam
	Thermo/src/levelgen/AS3Embed.as