Merge branch 'master' into 'master'

src/Log.cpp

src/URL.cpp

src/graphics/components/BoxComponent.cpp

src/graphics/components/Component.cpp

src/graphics/components/Component.h

src/graphics/components/ComponentBuilder.cpp

src/graphics/components/ComponentBuilder.h

src/graphics/components/DocumentComponent.cpp

src/graphics/components/InputComponent.cpp

src/graphics/components/InputComponent.h

src/graphics/components/MultiComponent.cpp

src/graphics/components/MultiComponent.h

src/graphics/components/TabbedComponent.cpp

src/graphics/components/TextComponent.cpp

src/graphics/opengl/Window.cpp

src/graphics/opengl/Window.h

src/graphics/text/TextRasterizer.cpp

src/graphics/text/TextRasterizer.h

src/graphics/text/TextRasterizerCache.cpp

src/main.cpp