Antialiasing on FBOs
Merge branch 'master' of github.com:olekristensen/Trae

# By Ole Kristensen
# Via Ole Kristensen
* 'master' of github.com:olekristensen/Trae:
  First draft friday presentation.

Conflicts:
	bin/data/timeline0_Lights_trackPositions.xml
	bin/data/timeline0_Trae_Scene_trackPositions.xml
	bin/data/timeline0_Trunk_Rings_trackPositions.xml