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

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