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

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