Correcting some bugs in Q3BSPZipArchive
Another small bug correction in Q3BSPZipArchive
Correcting a bug where the constructor & destructor of aiScene were not exported correctly in the assim library
Adding support for matrix4x4 construction from position, rotation and scaling parameters
Improving constructors of aiNode & aiScene
Fixed constructor of aiMesh for improved lisibility
Improving ColladaExporter to allow non-destructive cycles of import/export
Improving ColladaExporter to play nice with models imported from any format.
Improved collada exporter
Improving ColladaExporter to add shading model, bump mapping, transparent & refraction properties
Debugging ColladaExporter function for writing header information
Merge commit '87a0e7703258576f1a7e4ba763b961da70c1cd91' into contrib

Conflicts:
	code/ColladaExporter.cpp
Improved math operation with epsilon support
Improving ColladaExporter to support scenes with only one node
Improved CMakeLists.txt source groups
Merge commit '1f012384265e0dcc777e23369470391324d840e5' into contrib
Small corrections for the upgrading of zlib
Improving CMake to build the static version of assimp with the static version of zlib
Improved color comparison
Merge commit 'ca7542cf5d11ccde33e18365889343088bad9582' into contrib

Conflicts:
	CMakeLists.txt
	contrib/zlib/CMakeLists.txt
	contrib/zlib/zconf.h.included