Revert "Trimmed the branch to only the collada_parser sub directory"

This reverts commit 6b268ffe4813dc752f39a671dea836b3cb2feb6f.
Rebase from 'upstream'
Trimmed the branch to only the collada_parser sub directory