Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives

Conflicts:
	imgui.cpp

imgui.h

@@ -746,12 +746,11 @@ struct ImGuiIO
 template<typename T>
 class ImVector
 {
-protected:
+public:
     int                         Size;
     int                         Capacity;
     T*                          Data;
 
-public:
     typedef T                   value_type;
     typedef value_type*         iterator;
     typedef const value_type*   const_iterator;