Merge branch 'github.com/master'
fix the emscripten premake module to properly handle paths with spaces on windows
add missing lights for the "assimp" example
Merge branch 'origin/dev'