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

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