Merge branch 'develop' of https://github.com/openframeworks/openFrameworks into feature-3dGraphics
ofMeshFace: arrays -> vectors to avoid memory problems + face normal as method
Merge pull request #2 from arturoc/3dprimitives

ofMeshFace: arrays -> vectors to avoid memory problems + face normal as method
Merge pull request #1845 from roymacdonald/ofCamsAdditions

new getters in ofCamera
Merge pull request #1842 from timscaffidi/bugfix_gstVideoGrabber_formatType

included support for PREFER_RGB_OVER_YUV and PREFER_NON_COMPRESSED ...
Merge pull request #1799 from roymacdonald/feature-simpleEventExample

new events example. simpleEventsExample
ofCamera: remove dependencies with glu
Merge branch 'feature-matrixmode' into bugfix-ofCamera2

Conflicts:
	libs/openFrameworks/3d/ofCamera.cpp
ofCamera: fix const correctness
Merge branch 'develop' into feature-ofParameter

Conflicts:
	addons/ofxGui/src/ofxBaseGui.h
	addons/ofxGui/src/ofxPanel.h
	libs/openFrameworks/events/ofEventUtils.h
	libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj
ofxGuiGroup: fix refresh on load
ofxGui: void event for buttons
gui: several fixes for setup/constructors ambiguities and serialization
Merge pull request #116 from arturoc/feature-makefileRefactoring

Feature makefile refactoring + osx working (almost)
gui/ofParameter: fix copy semantics for = operator + fix examples
Merge branch 'feature-ofParameter' of github.com:arturoc/openFrameworks into feature-ofParameter

Conflicts:
	libs/openFrameworks/types/ofParameter.h
ofxGui: visual groups for ofxGuiGroup
gui: moved examples to examples/gui
gui: fix osc sync for object types
gui osc examples: actually do something with the parameters