Timelines for camera frustrum offset.
Flags for trunkrings
Added timeline XML files
Rotation knockover and beginning of shader for trunkRings.
Merge branch 'master' of github.com:olekristensen/Trae

# By Ole Kristensen
# Via Ole Kristensen
* 'master' of github.com:olekristensen/Trae:
  Trees have ground and material colors
  Lights have own timeline and scene Added Tree intro like fly light thingy

Conflicts:
	bin/data/GUI/guiSettings.xml
	bin/data/Master_Page_One_trackPositions.xml
	bin/data/Master_Radius.xml
	bin/data/Master_Ring.xml
	bin/data/Master_Trunk_Rings_trackPositions.xml
	bin/data/Master_inout.xml
	bin/data/timeline0_Page_One_trackPositions.xml
	bin/data/timeline0_Ring.xml
	bin/data/timeline0_Trunk_Rings_trackPositions.xml
	bin/data/timeline0_curves.xml
	bin/data/timeline0_zoomer.xml
	src/testApp.cpp
xml files and shaders
Merged lights. Not working with treerings yet.