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
Ignore icon.rc in examples
Fix icon.rc includes in project
ofxAssimpModelLoader: fix for gles2
glfw3: windows libs and projects
Merge branch 'feature-elinuxProgrammableGL' of git://github.com/arturoc/openFrameworks into feature-elinuxProgrammableGL
ofVbo: initially set supportVAO to true so copies work without problem
fontShapesExample: remove special character
fontShpesExample: don't try to draw escape
added special keys
glfw: add buffers resolution setters