changing 3DModelLoader addon to work with OpenGL ES
adding Android example for ofx3DModelLoader
significantly shortens ofLog messages, fixes #1150
didn't realize there were two places where ofLog prints from
Merge branch 'develop' of github.com:openframeworks/openFrameworks into fix-ofLog-formatting
uncommented std out vs std err test. thanks dan :)
working version
ofSystemTextDialog: linux implementation only
ofSystemTextDialog: added cancel button
added OSX ofSystemSaveDialog, fixed question display bug with Linux ofSystemSaveDialog
ofSystemTextDialog: windows dialog non modal buttons not working
ofSystemUtils: ifdef win32
ofSystemUtils: fix windows dialog
projectGenerator, Utils: only read first line of config
Merge branch 'develop' of github.com:openframeworks/openFrameworks into feature-ofSystemTextDialog
Merge remote-tracking branch 'upstream/develop' into develop
Add deprecation macros
Add (temporary) deprecation-test app.

Can be removed later, but is nice for demonstrating the features.
Added ofRectRounded functions to ofGraphics.
Merge branch 'develop' into feature-ofSystemTextDialog

Conflicts:
	libs/openFrameworks/utils/ofSystemUtils.cpp