Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Add support for SetTexParameters.  Made SetTexParameters a property TexParameters.  Added a new Property called SamplerState to the CCTexture2D for non OpenGL systems.
Merge pull request #129 from mono/master

Add support for SetTexParameters.