Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
adds ofMatrixMode
load/mult matrices methods for cairo
ofCamera totally independent from openGL
fixed broken hole detection in CV contour finder, ofxCvBlob.hole bool now works correctly; updated openCVExample to denote detected holes with some text to make checking this easier in the future; also updated sprintf in example to use a stringstream
ofCamera: remove dependencies with glu
Merge branch 'feature-matrixmode' into bugfix-ofCamera2

Conflicts:
	libs/openFrameworks/3d/ofCamera.cpp
ofCamera: fix const correctness
Merge pull request #1846 from arturoc/bugfix-ofCamera2

ofCamera: remove dependencies with glu, openGL + fix const correctness
ofOpenALSoundPlayer: fix stop/pause for streams
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
Merge pull request #1798 from danomatika/develop

fixed broken hole detection in CV contour finder
Merge pull request #3 from arturoc/3dprimitives

3dprimitives optimizations + fix warnings
Merge branch 'develop' of https://github.com/openframeworks/openFrameworks into feature-3dGraphics
Rename ofPrimitiveBase to of3dPrimitive and _mesh to mesh
Added ofDraw Methods with ofSphere, ofCone and ofBox deprecated method warnings.
Merge branch 'feature-3dGraphics' of https://github.com/NickHardeman/openFrameworks into feature-3dGraphics
Adding ofDraw to beginning of static function calls
3dprimitives: several fixes + optimizations