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

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