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

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