Merge pull request #1 from meta-androcto/master

testing merging. Should be FROM meta TO Italic_
Updated Octane to 2.02 by steveps3 on the octane forums: http://render.otoy.com/forum/viewtopic.php?f=32&t=37879

Includes fixes to the octane materials to not write materials into the new OCS2 scene file format.
Merge pull request #4 from Italic-/master

Merge to meta