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

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