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

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