Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
ofGLUtils: fix 1 and 2 channels internalFormats for programmableGL
ofGLUtils: GL_R is not supported in GLES
programmableGL: add format swizzles method to ofTexture

and use it for uploading 1 and 2 channels pixels from ofImage,
ofVideoGrabber/Player
ofAppRunner: shutdown http properly to avoid crashes on exit. Fixes: #2177
linux compilePG.sh: change owner of obj folder in addons after compiling PG
removes all install.xml in addons, we now use addons_config.mk. Closes #1917
ofMAterial: set material for FRONT and back in separate calls. Closes #1605
Merge pull request #2207 from fx-lange/patch-1

Update config.project.mk: PROJECT_ADDONS_CFLAGS missing
ofxGui: default to bitmapString + simplified drawing + methods to change font
ofBitmapFont: functions to get text mesh + texture
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
adding checks for null and default values to getValue()
ofxGui: methods to allow changing default sizes and colors
Merge pull request #20 from joshuajnoble/arturo-ofxmlfix

adding checks for null and default values to getValue()
Merge branch 'develop' into bugfix-ofXML

Conflicts:
	addons/ofxGui/src/ofxBaseGui.h
project wasn't compiling properly, too much time in Javascript lately :/
Merge pull request #21 from joshuajnoble/arturo-ofxmlfix

fixing some really silly errors
Merge branch 'bugfix-ofXML' of github.com:arturoc/openFrameworks into bugfix-ofXML
gui examples: remove ofxXmlSettings from addons.make
Merge pull request #2235 from arturoc/bugfix-ofXML

Bugfix ofXml + ofxGui using ofXml- don't merge yet