Adjusting the Collada Color Parser

The collada parser parses the RGB descriptor out of the
xml file, but does not use this information when constructing
the actual mColors array.

If you export a collada file with RGB colors, and then import it,
it used to create color values in the form RGBR, taking the
R component from the next color tuple instead of filling in
sensible defaults for the alpha channel.

This patch uses the information to fill each color.
Fixing some whitespace issues in ColladaParser
Merge branch 'master' of https://github.com/albert-wang/assimp

Conflicts:
	code/ColladaParser.cpp
update      : implement obj-support for normal maps.
refactoring : some improvements for more readable code.

Signed-off-by: Kim <Kulling>
- STEP: fix possible compilation error due to unwanted line continuation in a comment line.
Merge branch 'master' of github.com:assimp/assimp
- Ifc: append GUID to node names to preserve them.