ofUnityWindows but stock on matrix
Merge branch 'master' of github.com:obviousjim/ofxUnity

Conflicts:
	RenderingPlugin/RenderingPlugin/RenderingPlugin.cpp
	UnityProject/Assets/Plugins/RenderingPlugin.bundle.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/GLUT.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/copy.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/extrude.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glsmap.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glsmapint.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glut.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glutbitmap.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glutf90.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glutstroke.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/gutil.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/intersect.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/port.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/rot.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/segment.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/tube.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/tube_gc.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Headers/vvector.h.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/Caution.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib/classes.nib.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib/info.nib.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib/objects.nib.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/classes.nib.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/info.nib.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/objects.nib.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/classes.nib.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/info.nib.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/objects.nib.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTUI.strings.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/InfoPlist.strings.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/Info.plist.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/blankCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/bottomCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/bottomleftCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/bottomrightCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/crossCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/cycleCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/destroyCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/fingerCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/helpCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/leftCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/leftRightCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/rightArrowCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/rightCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/sprayCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/topCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/topleftCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/toprightCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/upDownCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Frameworks/GLUT.framework/Versions/A/Resources/waitCursor.tiff.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Info.plist
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Info.plist.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/MacOS.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/MacOS/RenderingPlugin
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/MacOS/RenderingPlugin.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Resources.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Resources/en.lproj.meta
	UnityProject/Assets/Plugins/RenderingPlugin.bundle/Contents/Resources/en.lproj/InfoPlist.strings.meta