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

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