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

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