Merge branch 'master' into audio

Conflicts:
	engine/CMakeLists.txt
	engine/Device.cpp
	engine/Device.h
	engine/audio/sles/SLESRenderer.h
	engine/compilers/lua/LuaCompiler.cpp
	engine/core/strings/StringStream.h
	engine/os/android/ApkFilesystem.h
	engine/resource/Bundle.h
	engine/resource/FileBundle.cpp
	engine/resource/MeshResource.cpp
	engine/resource/SoundResource.cpp
	engine/resource/SoundResource.h
	engine/resource/TextureResource.cpp
	tools/CMakeLists.txt
	tools/cli/resource-compiler.cpp
	tools/core/Resource.h
	tools/core/formats/SoundFormat.h