Removed ugly hack to get cam pos in Light
Added camera track to Trae
First sequence begun
Intro, a bit slower
Sunday evening sequence
Merge with tree intro intact (sorry #mrbichel)
Merge branch 'master' of https://github.com/olekristensen/Trae

# By Johan Bichel Lindegaard
# Via Johan Bichel Lindegaard
* 'master' of https://github.com/olekristensen/Trae:
  Merged lights. Not working with treerings yet.
  xml files and shaders
  Rotation knockover and beginning of shader for trunkRings.
  Added timeline XML files
  Flags for trunkrings
  Timelines for camera frustrum offset.

Conflicts:
	bin/data/GUI/guiSettings.xml
	bin/data/timeline0_Enabled_Scene.xml
	bin/data/timeline0_Lights_trackPositions.xml
	bin/data/timeline0_Page_One_trackPositions.xml
	bin/data/timeline0_inout.xml
	bin/data/timeline0_zoomer.xml
	src/Lights.cpp
	src/testApp.cpp