fix: pre-compiled header conflicts across different build configurations
Merge branch 'master' of https://github.com/tszirr/assimp
fix: only add uninstall target if not previously defined
Merge https://github.com/hrehfeld/assimp
Default to light gray diffuse for STL

For consistency, use a light gray default diffuse color for STL files.
This provides consistency with other geometric types, like PLY, that use a
light-gray default material.
Properly parse 'mg' keyword in .obj files

The 'mg' keyword is currently being interpreted as a material library keyword,
when it really refers to the merging group.  Handle this case, in effect ignoring
the keyword as merging groups are currently unsupported.
Merge pull request #198 from hrehfeld/master

CMake Fixes
Merge pull request #200 from jdduke/stl_gray_diffuse

Default to light gray diffuse for STL
Merge pull request #199 from jdduke/obj_mg_parse

Properly parse 'mg' keyword in .obj files
Add Blender 2.69 test files (first set - no UVs here or other fancy stuff)
Fix Obj texture parsing error: where obj texture map statement contains texture option, it will fail to parse the correct image url, as a result, the texture won't be shown. Besides, we also add clamp texture mode for obj
refactor the code, also  parse texture option explictly
Merge pull request #204 from zhgw01/zhgw01/FixObjTextureUrl

Fix Issue #201: When Obj texture map statement contains texture option, assimp will fail to import texture
Update Readme.md
Fix build exclude define in BlenderScene.cpp, fixes #205
Add support for emissive and gloss-maps

Conflicts:
	code/ObjFileMtlImporter.cpp
	Someone added support for loading more bump maps, I added support for emmissive-maps. Easy merge.
Fixes warnings in clang for unrecognized attribute 'gcc_struct'
Merge pull request #208 from NickNick/master

Add support for emissive and gloss-maps
fix for collada parser when importing empty arrays.

Exiting function so early break the parsing procedure, misses node closing and causes improper initialization of element (cannot be referenced later on)
Merge pull request #210 from VirusFree/master

fix for collada parser when importing empty arrays.