Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/arris69/assimp
Rebase BLEND regression db entries

Now that .blend import works properly for non-BMesh-containing meshes,
all .blend regression test cases should now succeed. Rebase accordingly.
Use VC11 build for DB generation
Use Linux/GCC build for DB generation
Use strict inequality when validating BMesh uvloop access

Change the inequality to a strict inequality when validating
BMesh uvloop access during face conversion.
Merge pull request #391 from jdduke/fix_blend_bmesh_uvloop

Use strict inequality when validating BMesh uvloop access
Merge pull request #388 from jdduke/rebase_blend_regression_db

Rebase BLEND regression db entries
update:
- add assert test in obj-import
- fix material token in Obj.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
use std:: namespace for most cmath functions:

http://en.cppreference.com/w/cpp/header/cmath
Merge pull request #394 from abma/master

use std:: namespace for most cmath functions:
refactoring: remove duplicate code.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
Null-terminate string

In theory it shouldn't be necessary since the length is specified but there are parts like https://github.com/assimp/assimp/blob/master/code/MaterialSystem.cpp#L74 that depend on it.
Merge pull request #395 from Gargaj/patch-1

Null-terminate string
New boost versions
Merge pull request #396 from OgreTransporter/master

New boost versions
Android JNI asset extraction support (API 9+)

Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
Android JNI asset extraction support (API 9+)

- installation fixes

Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
Merge pull request #399 from filipwasil/Android_JNI_Asset_extraction_support

Android JNI asset extraction support (API 9+)
bugfix: search for token checks for the given tokenlist against the lowercased info coming from the asset file. So we also have to used a lowercased token. Thanks to Robinson for the report.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>