changed the default sendMessage method in osc sender. now sends simple message by default
merging from master
trying to merge master into develop
Missing include in codeblocks template.

This include is not missing in the openFrameworks library cbp, but it is
missing in the projects cbp.
adds texture alpha mask. Closes #172
ofImage: add bind parameter to specify textureLocation
ofTexture: setters for texture matrix.
ofxAndroidVideoPlayer: change the way we set the textureMatrix
ofxAndroidVideoGrabber: use setter to set texture matrix
bringing develop up to date
using the master version of osc sender
changed assimp's aiImportFileFromMemory to aiImportFile and removed load from buffer method
added back load from buffer method
refactored loadModel for file and buffer
added comment for methods in header
Merge pull request #3099 from trentbrooks/bugfix-assimp-windows

Bugfix assimp windows + osx
ofParameter(Group): move parent from ofParameter into concrete classes. Closes #3103
Merge branch 'master' of github.com:openframeworks/openFrameworks
Merge pull request #3092 from arturoc/feature-textureAlphaMask

adds texture alpha mask. Closes #172
ofOpenALSoundPlayer: fix static deinitialization fiasco. Closes #3105
Merge branch 'master' of github.com:openframeworks/openFrameworks