Merge remote-tracking branch 'openFrameworks/master'

Conflicts:
	addons/ofxiOS/src/utils/ofxiOSExtras.mm
	addons/ofxiOS/src/utils/ofxiOSImagePicker.h
	libs/openFrameworks/app/ofAppRunner.cpp
	libs/openFrameworks/events/ofEvents.cpp
	libs/openFrameworks/gl/ofMaterial.h
	libs/openFrameworks/types/ofColor.h
	libs/openFrameworks/types/ofRectangle.cpp
	libs/openFrameworks/utils/ofUtils.cpp
	libs/openFrameworks/utils/ofUtils.h
	libs/openFrameworksCompiled/project/android/makefile
	libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig
	libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj
	libs/openFrameworksCompiled/project/makefileCommon/Makefile.examples