Merge "Added Emscripten guide" into devel/master