Merge branch 'main' into dec-2014

# Conflicts:
#	Minecraft.Client/ClientConnection.cpp
#	Minecraft.Client/Common/UI/UIController.cpp

Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.h

@@ -10,6 +10,9 @@ class UIScene_AbstractContainerMenu : public UIScene, public virtual IUIScene_Ab
 private:
 	ESceneSection m_focusSection;
 	bool m_bIgnoreInput;
+#ifdef _WINDOWS64
+	bool m_bMouseDragSlider;
+#endif
 
 protected:
 	UIControl m_controlMainPanel;