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

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