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

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