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

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