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

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