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

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