macosx patches
Merge remote-tracking branch 'origin'
temporary fix for std::set and adding missing file
Merge pull request #165 from OpenCOLLADA/master

mac os x changes