TrunkRings have normals, can reflect light
Merge branch 'master' of https://github.com/olekristensen/Trae

# By Johan Bichel Lindegaard
# Via Johan Bichel Lindegaard
* 'master' of https://github.com/olekristensen/Trae:
  Curves keyframes for controlling trunk rings.

Conflicts:
	bin/data/timeline0_Page_One_trackPositions.xml
	src/TrunkRings.h