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

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