Merge branch 'master' into docking inc alter GetWindowResizeID

# Conflicts:
#	imgui.cpp