added ColorData struct to ofMaterial

added ofMaterial::ColorData and ofMaterial::getColorData. Makes it
easier to pass color data to a Ubo
wrapped ofMaterial members into Data member
moved ofMaterial::setData to different line

looks more organized.
makefile: fix for addons
Merge pull request #3233 from Ahbee/ofMaterial_Data

added Data struct to ofMaterial
ofVideoGrabber: fix setDeviceID
Merge branch 'master' of github.com:openframeworks/openFrameworks
remove debug traces
ofVideoGrabber: isUsingTexture should be const
ofBaseHasTexture: make isUsingTexture not impl to avoid accidental shadowing from wrong const
Converted Xcode template project back to XML format.
ofBaseHasTexture: make isUsingTexture not impl to avoid accidental shadowing from wrong const
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofConstants: remove constant accidentally commited
Merge pull request #3253 from prisonerjohn/hotfix-templatexml

Converted Xcode template project back to XML format.