Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master ...

# Conflicts:
#	imgui.cpp
#	imgui.h

Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.

Added PushStyleColor(ImGuiCol idx, ImU32 col) overload. (Which _might_ cause an "ambiguous call" compilation error if you are using ImColor() with implicit cast. Cast to ImU32 or ImVec4 explicily to fix.)

Merge branch 'master' into styles ...

# Conflicts:
#	TODO.txt

Demo: Tweaked Fonts section.

Marked the weird IMGUI_ONCE_UPON_A_FRAME helper macro as obsolete. prefer using the more explicit ImGuiOnceUponAFrame. Removed the broken __LINE__ from IMGUI_ONCE_UPON_A_FRAME

Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update

Comments

Demo: Fixed conflicting id introduced in be96284 . Added tooltip.

Demo: Consoles: Added "Copy" button to demonstrate LogToClipboard

Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS

Demo: Rearranged everything under Widgets in a more consistent way.

Demo: Merged a few demo tweaks from navigation branch to minimize drift.

Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). (#346)

Demo: Color widget demo tweaks (#346)

Merge remote-tracking branch 'origin' into 2016-02-colorpicker

Fixed Y scroll aiming when Horizontal Scrollbar is enabled (#665). Tweak log demo.

Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). (#1271)

Demo: Comment about 'static' and some tweaks (#1267)

ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). (#346)

ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). (#346)

Demo: Tweaks

Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview (#346)

Demo: custom ColorPicker popup example tweaks (#346)

Demo: custom ColorPicker popup example (#346)

ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. (#346)

Demo: Comments (#346)

ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo code. (#346)

ColorPicker: Comments. Single input value mode allow access to context-menu options. (#346)

ColorPicker: Forward AlphaPreview flag to its individual inputs/sliders. Split code into extra lines to make logic more readable. (#346)