check if currentShader exists - prevents segfault
Merge pull request #2483 from jvcleave/bugfix-shader-null-check

check if currentShader exists - prevents segfault
Delete emptyExample.vcxproj.orig

Maybe created on rebasing/merging, not needed.
Merge pull request #2486 from LeoColomb/patch-1

Delete emptyExample.vcxproj.orig
Fix for issue 2490.
Merge pull request #2497 from bakercp/hotfix-2490

Fix for issue 2490.
ofxAppEGLWindow fix for seamless compatibilty with recent RPI firmware udpates.
Debug output cleanup.
Merge pull request #2500 from bakercp/bugfix-rpi-firmware-update

ofxAppEGLWindow fix
added ofParameter<string> support in the setup routine

sting parameters in a group were not shown before
Merge pull request #2503 from julianadenauer/patch-1

added ofParameter<string> in the setup routine of ofxGuiGroup
Update and alphabetize addons/.gitignore entries.
Update ofColor == and != operators to also test alpha
Merge pull request #2512 from rbeitra/master

Fix for issue #2496 (ofColor == and != operators ignoring alpha)
tiny log fix in ofSerial
Merge pull request #2518 from armadillu/ofSerialLogMissingSpace

tiny log fix in ofSerial
bug fix - template ofApp needs to extend ofxiOSApp

fixes #2514
Merge pull request #2521 from julapy/ios-fix-ofApp-template

bug fix - template ofApp needs to extend ofxiOSApp
ofGst* separate the setPipeline and startPipeline calls to have more control on the initialization
Update CONTRIBUTE.md with the latest branch structure changes.