namespace-b-gone
added made color const for setColor, added setColor for index, made setColorfor the entire image faster per suggestion from @arturoc
Merge pull request #1912 from kylemcdonald/feature/setColor-fill

added ofPixels::setColor(ofColor) and ofImage::setColor(ofColor)
Merge pull request #1935 from bakercp/bugfix-ofLaunchBrowser

Fixes #1934
Merge branch 'feature-interpolation1d' of github.com:arturoc/openFrameworks into arturoc-feature-interpolation1d
Merge branch 'develop' of github.com:openframeworks/openFrameworks into arturoc-feature-interpolation1d
renamed of*Interpolate() to ofInterpolate*()
merging ofFont iso8859-1 support
fixed a bug with ofPolyline::simplify when there are 0 vertices, added a test character to fontShapesExample to test iso8859-1 support
Merge pull request #2091 from kylemcdonald/fix/ofTexture-loadData

autoallocate on ofTexture::loadData changes
merged dev apps for testing polyline resampling and new code from @memo for ofPolyline
Merge branch 'develop' of github.com:openframeworks/openFrameworks into memo-feature-ofPolylineSampling
merged icons with develop, -DDEBUG is being handled separately
added natural sort order for ofDirectory::sort(). closes #2045.
Merge branch 'icons' of github.com:LeoColomb/openFrameworks
Merge branch 'develop' of github.com:openframeworks/openFrameworks into mergedevelopProgrammableGL

Conflicts:
	libs/openFrameworks/gl/ofTexture.cpp
	libs/openFrameworks/graphics/ofGraphics.h
	libs/openFrameworks/graphics/ofPath.cpp
	libs/openFrameworks/graphics/ofTrueTypeFont.cpp
	libs/openFrameworks/graphics/ofTrueTypeFont.h
	scripts/dev/create_package.sh
	scripts/win_cb/template/emptyExample.cbp
ofFbo: remove ofIsFixedGL
android makefile: add gles2 library
makefiles: fix compile rule
refactor out fps calculation