Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl3.cpp

InputText, Examples/SDL: Emulate \t input if back-end doesn't provide it. (#1336, #2467) ...

+ Fix some output filename in SDL build batch files.

Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples.

Merge branch 'master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui_widgets.cpp

Examples: VS: Made project paths independant of SolutionDir so they can be built aside from the solution.

Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_widgets.cpp

Examples: SDL: Using the SDL_WINDOW_ALLOW_HIGHDPI flag. (#2306, #1676) [@rasky]

Merge branch 'viewport' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_draw.cpp

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_vulkan.h
#	imgui.cpp

Removed trailing spaces (#2038, #2299)

Merge branch 'viewport' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h

Viewport: Misc comments following user feedbacks..

Merge branch 'viewport' into docking ...

# Conflicts:
#	examples/example_allegro5/main.cpp
#	examples/example_win32_directx9/main.cpp

Merge branch 'master' into viewport + added style tweak block when viewports are enabled ...

# Conflicts:
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_win32_directx11/main.cpp

Examples: Setting up style before bindings, so in complex binding (vulkan/dx12) it isn't miles away from the context creation.

Examples: Viewport: Moved the "make current GL context" to reduce the amount of call and hopefully be more explicit about viewport enabled vs disabled requirements. (#1542)

Merge branch 'viewport' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt

Somehow VS keeps modifying this GUID so I am going to playing along with it.

Merge branch 'viewport' into docking ...

# Conflicts:
#	examples/example_allegro5/main.cpp
#	examples/example_marmalade/main.cpp

Merge branch 'master' into viewport + specific changes for GLFW callbacks ...

# Conflicts:
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx9/main.cpp
#	examples/imgui_impl_glfw.cpp

Examples: Misc comments mainly related to GLFW callbacks. (#1759)

Merge branch 'viewport' into docking

Examples: SDL: Tweaked Windows instructions and batch files. (#2175)

Viewport: Fixed SDL+OpenGL2 example to work with multi-viewports. (#2175)

Examples: SDL: Tweaked Windows instructions and batch files. (#2175)

Merge branch 'viewport' into docking ...

# Conflicts:
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_opengl2/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	examples/example_win32_directx9/main.cpp

Viewport: Enabled viewports by default in more example apps.

Merge branch 'viewport' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_demo.cpp
#	imgui_internal.h

Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.

Examples: Enabled Docking + Nav by default in the branch. (#351)